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

Unified Diff: ui/views/mus/aura_init.cc

Issue 2420253002: Rename shell namespace to service_manager (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 | « ui/views/mus/aura_init.h ('k') | ui/views/mus/clipboard_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/aura_init.cc
diff --git a/ui/views/mus/aura_init.cc b/ui/views/mus/aura_init.cc
index 8183e5981264521d9209e01a7ca63753dd37145d..937d6b3daec823918252e2662e640b5a917a170b 100644
--- a/ui/views/mus/aura_init.cc
+++ b/ui/views/mus/aura_init.cc
@@ -45,7 +45,7 @@ class MusViewsDelegate : public ViewsDelegate {
} // namespace
-AuraInit::AuraInit(shell::Connector* connector,
+AuraInit::AuraInit(service_manager::Connector* connector,
const std::string& resource_file,
const std::string& resource_file_200)
: resource_file_(resource_file),
@@ -80,7 +80,7 @@ AuraInit::~AuraInit() {
#endif
}
-void AuraInit::InitializeResources(shell::Connector* connector) {
+void AuraInit::InitializeResources(service_manager::Connector* connector) {
// Resources may have already been initialized (e.g. when 'chrome --mash' is
// used to launch the current app).
if (ui::ResourceBundle::HasSharedInstance())
« no previous file with comments | « ui/views/mus/aura_init.h ('k') | ui/views/mus/clipboard_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698