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

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

Issue 2398783002: Rename a bunch of Mojo Application stuff to reference Services. (Closed)
Patch Set: . Created 4 years, 2 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 c9a41e888ecd7835f136d514bb39b90788a0abc4..605f476d6ac5a190f73ebede31ccb3a6e99f0e4d 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -50,7 +50,7 @@
#if defined(USE_AURA)
#include "chrome/browser/ui/views/tabs/window_finder_mus.h" // nogncheck
-#include "content/public/common/mojo_shell_connection.h" // nogncheck
+#include "content/public/common/service_manager_connection.h" // nogncheck
#include "services/shell/runner/common/client_util.h" // nogncheck
#include "ui/aura/env.h" // nogncheck
#include "ui/aura/window.h" // nogncheck
@@ -229,9 +229,9 @@ TabDragController::TabDragController()
instance_ = this;
#if defined(USE_AURA)
- content::MojoShellConnection* mojo_shell_connection =
- content::MojoShellConnection::GetForProcess();
- if (mojo_shell_connection && shell::ShellIsRemote())
+ content::ServiceManagerConnection* service_manager_connection =
+ content::ServiceManagerConnection::GetForProcess();
+ if (service_manager_connection && shell::ShellIsRemote())
window_finder_.reset(new WindowFinderMus);
else
#endif
« no previous file with comments | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc ('k') | chrome/test/base/mash_browser_tests_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698