Fixed bug where mash chrome crashes accessing ash::Shell with context menus

chrome/browser/ui/views/chrome_views_delegate.cc

Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 6523962eeedd142ec096abaf1134ec2df9efed0b..f59cd05a1da09d4071b965def2a65398ffd45b1e 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/lifetime/keep_alive_types.h"
 #include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
@@ -270,6 +271,10 @@ views::ViewsDelegate::ProcessMenuAcceleratorResult
 ChromeViewsDelegate::ProcessAcceleratorWhileMenuShowing(
     const ui::Accelerator& accelerator) {
 #if defined(USE_ASH)
+  // Early return because mash chrome does not have access to ash::Shell
+  if (chrome::IsRunningInMash())
+    return views::ViewsDelegate::ProcessMenuAcceleratorResult::CLOSE_MENU;

[sadrul, 2016/06/16 17:58:40]

I think we should do the default here, i.e. return LEAVE_MENU_OPEN from here.

[StarAZ, 2016/06/16 18:21:27]

Acknowledged.

+
   ash::AcceleratorController* accelerator_controller =
       ash::Shell::GetInstance()->accelerator_controller();