Browse Source

Fix Debug building on Windows

Cheng Zhao 8 years ago
parent
commit
a749a3dd2a

+ 0 - 4
brightray/browser/views/views_delegate.cc

@@ -100,10 +100,6 @@ void ViewsDelegate::OnBeforeWidgetInit(
 }
 
 
-base::TimeDelta ViewsDelegate::GetDefaultTextfieldObscuredRevealDuration() {
-  return base::TimeDelta();
-}
-
 bool ViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
 #if defined(OS_LINUX)
   // On Ubuntu Unity, the system always provides a title bar for maximized

+ 0 - 1
brightray/browser/views/views_delegate.h

@@ -51,7 +51,6 @@ class ViewsDelegate : public views::ViewsDelegate {
   void OnBeforeWidgetInit(
       views::Widget::InitParams* params,
       views::internal::NativeWidgetDelegate* delegate) override;
-  base::TimeDelta GetDefaultTextfieldObscuredRevealDuration() override;
   bool WindowManagerProvidesTitleBar(bool maximized) override;
 
  private:

+ 1 - 1
brightray/browser/win/notification_presenter_win.cc

@@ -56,7 +56,7 @@ bool NotificationPresenterWin::Init() {
 base::string16 NotificationPresenterWin::SaveIconToFilesystem(
     const SkBitmap& icon, const GURL& origin) {
   std::string filename = base::MD5String(origin.spec()) + ".png";
-  base::FilePath path = temp_dir_.path().Append(base::UTF8ToUTF16(filename));
+  base::FilePath path = temp_dir_.GetPath().Append(base::UTF8ToUTF16(filename));
   if (base::PathExists(path))
     return path.value();
   if (SaveIconToPath(icon, path))

+ 1 - 1
brightray/vendor/libchromiumcontent

@@ -1 +1 @@
-Subproject commit 446afde7ffbd4dd2f73d4d7ae9811f093b1c017c
+Subproject commit b71afafe59998daf0cb275b50140378b8c88b101