From 69a89303d0781223dac233790a166709f60a5838 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 13 Oct 2014 11:03:56 +0800
Subject: [PATCH] Fix building on Linux

---
 atom/browser/api/atom_api_menu_views.cc | 5 ++---
 atom/browser/ui/message_box_views.cc    | 2 +-
 atom/browser/ui/views/menu_delegate.cc  | 5 ++---
 vendor/brightray                        | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/atom/browser/api/atom_api_menu_views.cc b/atom/browser/api/atom_api_menu_views.cc
index 2a2b85b57de7..a6292fbc142f 100644
--- a/atom/browser/api/atom_api_menu_views.cc
+++ b/atom/browser/api/atom_api_menu_views.cc
@@ -17,14 +17,13 @@ MenuViews::MenuViews() {
 
 void MenuViews::Popup(Window* window) {
   gfx::Point cursor = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
-  views::MenuRunner menu_runner(model());
+  views::MenuRunner menu_runner(model(), views::MenuRunner::CONTEXT_MENU);
   ignore_result(menu_runner.RunMenuAt(
       static_cast<NativeWindowViews*>(window->window())->widget(),
       NULL,
       gfx::Rect(cursor, gfx::Size()),
       views::MENU_ANCHOR_TOPLEFT,
-      ui::MENU_SOURCE_MOUSE,
-      views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU));
+      ui::MENU_SOURCE_MOUSE));
 }
 
 // static
diff --git a/atom/browser/ui/message_box_views.cc b/atom/browser/ui/message_box_views.cc
index a807eaac0cf1..acc9533a081b 100644
--- a/atom/browser/ui/message_box_views.cc
+++ b/atom/browser/ui/message_box_views.cc
@@ -145,7 +145,7 @@ MessageDialog::MessageDialog(NativeWindow* parent_window,
     views::LabelButton* button = new views::LabelButton(
         this, base::UTF8ToUTF16(buttons[i]));
     button->set_tag(i);
-    button->set_min_size(gfx::Size(60, 30));
+    button->SetMinSize(gfx::Size(60, 30));
     button->SetStyle(views::Button::STYLE_BUTTON);
     button->SetGroup(kButtonGroup);
 
diff --git a/atom/browser/ui/views/menu_delegate.cc b/atom/browser/ui/views/menu_delegate.cc
index 88d1b689b5c3..589bc984d159 100644
--- a/atom/browser/ui/views/menu_delegate.cc
+++ b/atom/browser/ui/views/menu_delegate.cc
@@ -35,14 +35,13 @@ void MenuDelegate::RunMenu(ui::MenuModel* model, views::MenuButton* button) {
   id_ = button->tag();
   views::MenuItemView* item = BuildMenu(model);
 
-  views::MenuRunner menu_runner(item);
+  views::MenuRunner menu_runner(item, views::MenuRunner::CONTEXT_MENU);
   ignore_result(menu_runner.RunMenuAt(
       button->GetWidget()->GetTopLevelWidget(),
       button,
       bounds,
       views::MENU_ANCHOR_TOPRIGHT,
-      ui::MENU_SOURCE_MOUSE,
-      views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU));
+      ui::MENU_SOURCE_MOUSE));
 }
 
 views::MenuItemView* MenuDelegate::BuildMenu(ui::MenuModel* model) {
diff --git a/vendor/brightray b/vendor/brightray
index bb1e4f06960e..319c63da618f 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit bb1e4f06960e7f1a777a7709684ec69a10a85cc7
+Subproject commit 319c63da618f5fdff38f6a65c452f3802b8756d1