mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix Debug building on Windows

Browse source
This commit is contained in:
Cheng Zhao 2017-01-26 16:09:45 +09:00
parent 94fdcb4f48
commit a749a3dd2a
4 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brightray/browser/views/views_delegate.cc
View file

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

1
brightray/browser/views/views_delegate.h
View file

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

2
brightray/browser/win/notification_presenter_win.cc
View file

@ -56,7 +56,7 @@ bool NotificationPresenterWin::Init() {
base::string16 NotificationPresenterWin::SaveIconToFilesystem( base::string16 NotificationPresenterWin::SaveIconToFilesystem(
const SkBitmap& icon, const GURL& origin) { const SkBitmap& icon, const GURL& origin) {
std::string filename = base::MD5String(origin.spec()) + ".png"; 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)) if (base::PathExists(path))
return path.value(); return path.value();
if (SaveIconToPath(icon, path)) if (SaveIconToPath(icon, path))

2
brightray/vendor/libchromiumcontent vendored

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