Index: chrome/browser/ui/views/frame/browser_view.cc |
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc |
index 5be1927004853e3f1be96b09cca6cd2573717053..91265cb61edb64d3b84c64df7a3f9997c55f96ad 100644 |
--- a/chrome/browser/ui/views/frame/browser_view.cc |
+++ b/chrome/browser/ui/views/frame/browser_view.cc |
@@ -26,7 +26,6 @@ |
#include "chrome/browser/extensions/extension_util.h" |
#include "chrome/browser/extensions/tab_helper.h" |
#include "chrome/browser/infobars/infobar_service.h" |
-#include "chrome/browser/mojo_runner_util.h" |
#include "chrome/browser/native_window_notification_source.h" |
#include "chrome/browser/profiles/avatar_menu.h" |
#include "chrome/browser/profiles/profile.h" |
@@ -171,6 +170,10 @@ |
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
#endif |
+#if defined(MOJO_SHELL_CLIENT) |
+#include "content/public/common/mojo_shell_connection.h" |
+#endif |
+ |
using base::TimeDelta; |
using base::UserMetricsAction; |
using content::NativeWebKeyboardEvent; |
@@ -2389,8 +2392,10 @@ void BrowserView::LoadAccelerators() { |
// TODO(beng): for some reason GetFocusManager() returns null in this case, |
// investigate, but for now just disable accelerators in this |
// mode. |
- if (IsRunningInMojoRunner()) |
+#if defined(MOJO_SHELL_CLIENT) |
+ if (content::MojoShellConnection::Get()) |
return; |
+#endif |
views::FocusManager* focus_manager = GetFocusManager(); |
DCHECK(focus_manager); |