linux: Fix building for Chrome 40

diff --git a/atom/browser/ui/views/submenu_button.cc b/atom/browser/ui/views/submenu_button.cc
index 2405df3..bedbb98 100644 (file)
--- a/atom/browser/ui/views/submenu_button.cc
+++ b/atom/browser/ui/views/submenu_button.cc
@@ -37,7 +37,7 @@ SubmenuButton::SubmenuButton(views::ButtonListener* listener,
       underline_color_(SK_ColorBLACK) {
 #if defined(OS_LINUX)
   // Dont' use native style border.
-  SetBorder(CreateDefaultBorder().PassAs<views::Border>());
+  SetBorder(CreateDefaultBorder().Pass());
 #endif
 
   if (GetUnderlinePosition(title, &accelerator_, &underline_start_,

diff --git a/vendor/brightray b/vendor/brightray
index f155693..c96ee1e 160000 (submodule)
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit f1556936b01a2ec66d6af34ab26d839dc80dc266
+Subproject commit c96ee1ee1e2d1322c4d73be18f28c232587a43a2