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

Unified Diff: ash/mus/window_manager_application.h

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 | « ash/mus/window_manager.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_application.h
diff --git a/ash/mus/window_manager_application.h b/ash/mus/window_manager_application.h
index c0f63d7a7da53e898cefaf7c4cde1eec649c6c08..4e21b9af7e375f3588cb60b4de07f3335ec3dda5 100644
--- a/ash/mus/window_manager_application.h
+++ b/ash/mus/window_manager_application.h
@@ -52,9 +52,9 @@ class WindowManager;
// Hosts the window manager and the ash system user interface for mash.
class WindowManagerApplication
- : public shell::Service,
- public shell::InterfaceFactory<mojom::WallpaperController>,
- public shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>,
+ : public service_manager::Service,
+ public service_manager::InterfaceFactory<mojom::WallpaperController>,
+ public service_manager::InterfaceFactory<ui::mojom::AcceleratorRegistrar>,
public mash::session::mojom::ScreenlockStateListener {
public:
WindowManagerApplication();
@@ -78,17 +78,17 @@ class WindowManagerApplication
void InitializeComponents();
void ShutdownComponents();
- // shell::Service:
- void OnStart(const shell::Identity& identity) override;
- bool OnConnect(const shell::Identity& remote_identity,
- shell::InterfaceRegistry* registry) override;
+ // service_manager::Service:
+ void OnStart(const service_manager::Identity& identity) override;
+ bool OnConnect(const service_manager::Identity& remote_identity,
+ service_manager::InterfaceRegistry* registry) override;
// InterfaceFactory<mojom::WallpaperController>:
- void Create(const shell::Identity& remote_identity,
+ void Create(const service_manager::Identity& remote_identity,
mojom::WallpaperControllerRequest request) override;
- // shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>:
- void Create(const shell::Identity& remote_identity,
+ // service_manager::InterfaceFactory<ui::mojom::AcceleratorRegistrar>:
+ void Create(const service_manager::Identity& remote_identity,
ui::mojom::AcceleratorRegistrarRequest request) override;
// session::mojom::ScreenlockStateListener:
« no previous file with comments | « ash/mus/window_manager.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698