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

Unified Diff: mash/quick_launch/quick_launch.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 | « mash/quick_launch/main.cc ('k') | mash/quick_launch/quick_launch.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/quick_launch/quick_launch.h
diff --git a/mash/quick_launch/quick_launch.h b/mash/quick_launch/quick_launch.h
index 9645e73c47c8c0abedf5ac10bbbe7abaf960e60e..9be6bd4255945214ab0bdaee483c9baff3be486a 100644
--- a/mash/quick_launch/quick_launch.h
+++ b/mash/quick_launch/quick_launch.h
@@ -22,9 +22,10 @@ class WindowManagerConnection;
namespace mash {
namespace quick_launch {
-class QuickLaunch : public shell::Service,
- public mojom::Launchable,
- public shell::InterfaceFactory<mojom::Launchable> {
+class QuickLaunch
+ : public service_manager::Service,
+ public mojom::Launchable,
+ public service_manager::InterfaceFactory<mojom::Launchable> {
public:
QuickLaunch();
~QuickLaunch() override;
@@ -32,16 +33,16 @@ class QuickLaunch : public shell::Service,
void RemoveWindow(views::Widget* window);
private:
- // 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;
// mojom::Launchable:
void Launch(uint32_t what, mojom::LaunchMode how) override;
- // shell::InterfaceFactory<mojom::Launchable>:
- void Create(const shell::Identity& remote_identity,
+ // service_manager::InterfaceFactory<mojom::Launchable>:
+ void Create(const service_manager::Identity& remote_identity,
mojom::LaunchableRequest request) override;
mojo::BindingSet<mojom::Launchable> bindings_;
« no previous file with comments | « mash/quick_launch/main.cc ('k') | mash/quick_launch/quick_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698