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

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller.cc

Issue 2208613002: Remove MOJO_SHELL_CLIENT define. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 4 years, 4 months 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
Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 1eef99f88817ab353de962804916b60461e0e5c1..52206cfc3cf8511dd0b82f09203dc30b7fad96c1 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -49,15 +49,12 @@
#endif
#if defined(USE_AURA)
-#include "ui/aura/env.h"
-#include "ui/aura/window.h"
-#include "ui/wm/core/window_modality_controller.h"
-#endif
-
-#if defined(MOJO_SHELL_CLIENT)
#include "chrome/browser/ui/views/tabs/window_finder_mus.h"
#include "content/public/common/mojo_shell_connection.h"
#include "services/shell/runner/common/client_util.h"
+#include "ui/aura/env.h"
+#include "ui/aura/window.h"
+#include "ui/wm/core/window_modality_controller.h"
#endif
using base::UserMetricsAction;
@@ -231,7 +228,7 @@ TabDragController::TabDragController()
weak_factory_(this) {
instance_ = this;
-#if defined(MOJO_SHELL_CLIENT)
+#if defined(USE_AURA)
content::MojoShellConnection* mojo_shell_connection =
content::MojoShellConnection::GetForProcess();
if (mojo_shell_connection && shell::ShellIsRemote())

Powered by Google App Engine
This is Rietveld 408576698