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

linux: Fix building for Chrome 40

Browse source
This commit is contained in:
Cheng Zhao 2015-01-27 17:20:50 -08:00
parent dd606684c7
commit 0087f8da27
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/ui/views/submenu_button.cc
View file

@ -37,7 +37,7 @@ SubmenuButton::SubmenuButton(views::ButtonListener* listener,
underline_color_(SK_ColorBLACK) { underline_color_(SK_ColorBLACK) {
#if defined(OS_LINUX) #if defined(OS_LINUX)
// Dont' use native style border. // Dont' use native style border.
SetBorder(CreateDefaultBorder().PassAs<views::Border>()); SetBorder(CreateDefaultBorder().Pass());
#endif #endif
if (GetUnderlinePosition(title, &accelerator_, &underline_start_, if (GetUnderlinePosition(title, &accelerator_, &underline_start_,

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit f1556936b01a2ec66d6af34ab26d839dc80dc266 Subproject commit c96ee1ee1e2d1322c4d73be18f28c232587a43a2