Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2658)

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 1442893002: Move Shell connection to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@i2
Patch Set: . Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698