From a749a3dd2af69f9598dc6ca679f3a04cb683477d Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 26 Jan 2017 16:09:45 +0900 Subject: [PATCH] Fix Debug building on Windows --- brightray/browser/views/views_delegate.cc | 4 ---- brightray/browser/views/views_delegate.h | 1 - brightray/browser/win/notification_presenter_win.cc | 2 +- brightray/vendor/libchromiumcontent | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/brightray/browser/views/views_delegate.cc b/brightray/browser/views/views_delegate.cc index a18d52a6ae2f..8dcbe38ae209 100644 --- a/brightray/browser/views/views_delegate.cc +++ b/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 diff --git a/brightray/browser/views/views_delegate.h b/brightray/browser/views/views_delegate.h index 157660aa5d09..d63eeb533d67 100644 --- a/brightray/browser/views/views_delegate.h +++ b/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: diff --git a/brightray/browser/win/notification_presenter_win.cc b/brightray/browser/win/notification_presenter_win.cc index 107b62ea76b6..018fa3212a41 100644 --- a/brightray/browser/win/notification_presenter_win.cc +++ b/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)) diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index 446afde7ffbd..b71afafe5999 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 446afde7ffbd4dd2f73d4d7ae9811f093b1c017c +Subproject commit b71afafe59998daf0cb275b50140378b8c88b101