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

Unified Diff: mojo/services/view_manager/main.cc

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/view_manager/ids.h ('k') | mojo/services/view_manager/node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/view_manager/main.cc
diff --git a/mojo/services/view_manager/main.cc b/mojo/services/view_manager/main.cc
index 2254c76b19f47f143cd3949fa3cbb8a154122706..9f6285ffe99004f083650de700cfc596909b8270 100644
--- a/mojo/services/view_manager/main.cc
+++ b/mojo/services/view_manager/main.cc
@@ -8,7 +8,6 @@
#include "mojo/services/view_manager/view_manager_init_service_impl.h"
namespace mojo {
-namespace view_manager {
namespace service {
class ViewManagerApp : public ApplicationDelegate,
@@ -40,11 +39,10 @@ class ViewManagerApp : public ApplicationDelegate,
};
} // namespace service
-} // namespace view_manager
// static
ApplicationDelegate* ApplicationDelegate::Create() {
- return new mojo::view_manager::service::ViewManagerApp();
+ return new mojo::service::ViewManagerApp();
}
} // namespace mojo
« no previous file with comments | « mojo/services/view_manager/ids.h ('k') | mojo/services/view_manager/node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698