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

Unified Diff: mojo/examples/window_manager/window_manager.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/examples/window_manager/debug_panel.cc ('k') | mojo/examples/wm_flow/app/app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/window_manager/window_manager.cc
diff --git a/mojo/examples/window_manager/window_manager.cc b/mojo/examples/window_manager/window_manager.cc
index 1f4e597d472a123cbade3544d112f1ec9195f437..4ee5fd3c18f0877bbf4ccc0dd9f988ef306e07bd 100644
--- a/mojo/examples/window_manager/window_manager.cc
+++ b/mojo/examples/window_manager/window_manager.cc
@@ -32,16 +32,6 @@
#undef CreateWindow
#endif
-using mojo::view_manager::Id;
-using mojo::view_manager::Node;
-using mojo::view_manager::NodeObserver;
-using mojo::view_manager::View;
-using mojo::view_manager::ViewManager;
-using mojo::view_manager::ViewManagerClientFactory;
-using mojo::view_manager::ViewManagerDelegate;
-using mojo::view_manager::ViewObserver;
-using mojo::view_manager::WindowManagerDelegate;
-
namespace mojo {
namespace examples {
@@ -488,9 +478,9 @@ class WindowManager
keyboard_manager_->node()->Contains(target->node());
}
- Id CreateControlPanel(view_manager::Node* root) {
+ Id CreateControlPanel(Node* root) {
Node* node = Node::Create(view_manager_);
- View* view = view_manager::View::Create(view_manager_);
+ View* view = View::Create(view_manager_);
root->AddChild(node);
node->SetActiveView(view);
« no previous file with comments | « mojo/examples/window_manager/debug_panel.cc ('k') | mojo/examples/wm_flow/app/app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698