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

Unified Diff: mash/example/common/mus_views_init.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/catalog_viewer/main.cc ('k') | mash/example/views_examples/views_examples.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/example/common/mus_views_init.h
diff --git a/mash/example/common/mus_views_init.h b/mash/example/common/mus_views_init.h
index a37d7b86febf8bcaa99f807c70ea324688b6d4fe..0e5cb74f812fa0c4d75a11fff6140690e9af4134 100644
--- a/mash/example/common/mus_views_init.h
+++ b/mash/example/common/mus_views_init.h
@@ -13,7 +13,7 @@
#include "ui/views/mus/aura_init.h"
#include "ui/views/views_delegate.h"
-namespace shell {
+namespace service_manager {
class ServiceContext;
}
@@ -25,7 +25,7 @@ class AuraInit;
class MUSViewsInit : public views::ViewsDelegate,
public ui::WindowTreeClientDelegate {
public:
- explicit MUSViewsInit(shell::ServiceContext* app);
+ explicit MUSViewsInit(service_manager::ServiceContext* app);
~MUSViewsInit() override;
private:
@@ -45,7 +45,7 @@ class MUSViewsInit : public views::ViewsDelegate,
HICON GetSmallWindowIcon() const override;
#endif
- shell::ServiceContext* app_;
+ service_manager::ServiceContext* app_;
std::unique_ptr<views::AuraInit> aura_init_;
ui::mojom::WindowManagerPtr window_manager_;
« no previous file with comments | « mash/catalog_viewer/main.cc ('k') | mash/example/views_examples/views_examples.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698