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

Unified Diff: services/navigation/content_client/browser_main_parts.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
« no previous file with comments | « services/file/user_id_map.cc ('k') | services/navigation/content_client/content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/navigation/content_client/browser_main_parts.cc
diff --git a/services/navigation/content_client/browser_main_parts.cc b/services/navigation/content_client/browser_main_parts.cc
index ef91281118f3829e0891c4ca36110cb2e8484870..bb3059cd685d921bc3a7166a2371dcece328967a 100644
--- a/services/navigation/content_client/browser_main_parts.cc
+++ b/services/navigation/content_client/browser_main_parts.cc
@@ -5,7 +5,7 @@
#include "services/navigation/content_client/browser_main_parts.h"
#include "base/run_loop.h"
-#include "content/public/common/mojo_shell_connection.h"
+#include "content/public/common/service_manager_connection.h"
#include "content/shell/browser/shell_browser_context.h"
#include "content/shell/browser/shell_net_log.h"
#include "services/navigation/navigation.h"
@@ -24,12 +24,12 @@ void BrowserMainParts::ToolkitInitialized() {
}
void BrowserMainParts::PreMainMessageLoopRun() {
- content::MojoShellConnection* mojo_shell_connection =
- content::MojoShellConnection::GetForProcess();
- if (mojo_shell_connection) {
+ content::ServiceManagerConnection* service_manager_connection =
+ content::ServiceManagerConnection::GetForProcess();
+ if (service_manager_connection) {
window_manager_connection_ = views::WindowManagerConnection::Create(
- mojo_shell_connection->GetConnector(),
- mojo_shell_connection->GetIdentity());
+ service_manager_connection->GetConnector(),
+ service_manager_connection->GetIdentity());
}
net_log_.reset(new content::ShellNetLog("ash_shell"));
browser_context_.reset(
« no previous file with comments | « services/file/user_id_map.cc ('k') | services/navigation/content_client/content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698