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

Unified Diff: mojo/shell/view_manager_loader.h

Issue 418983002: Nukes view_manager namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve merge Created 6 years, 5 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 | « mojo/services/window_manager/window_manager_service_impl.cc ('k') | mojo/shell/view_manager_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/view_manager_loader.h
diff --git a/mojo/shell/view_manager_loader.h b/mojo/shell/view_manager_loader.h
index 72199f7288039006d459a3eadbaf674ba4b9848b..bb3a615471552f88f455f7e9cba6a84aa75bf325 100644
--- a/mojo/shell/view_manager_loader.h
+++ b/mojo/shell/view_manager_loader.h
@@ -23,7 +23,7 @@ namespace shell {
class ViewManagerLoader
: public ServiceLoader,
public ApplicationDelegate,
- public InterfaceFactory<view_manager::ViewManagerInitService> {
+ public InterfaceFactory<ViewManagerInitService> {
public:
ViewManagerLoader();
virtual ~ViewManagerLoader();
@@ -41,13 +41,13 @@ class ViewManagerLoader
virtual bool ConfigureIncomingConnection(
mojo::ApplicationConnection* connection) OVERRIDE;
- // InterfaceFactory<view_manager::ViewManagerInitService> overrides.
+ // InterfaceFactory<ViewManagerInitService> overrides.
virtual void Create(
ApplicationConnection* connection,
- InterfaceRequest<view_manager::ViewManagerInitService> request) OVERRIDE;
+ InterfaceRequest<ViewManagerInitService> request) OVERRIDE;
ScopedVector<Application> apps_;
- view_manager::service::ViewManagerInitServiceContext context_;
+ service::ViewManagerInitServiceContext context_;
DISALLOW_COPY_AND_ASSIGN(ViewManagerLoader);
};
« no previous file with comments | « mojo/services/window_manager/window_manager_service_impl.cc ('k') | mojo/shell/view_manager_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698