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

Unified Diff: mojo/examples/embedded_app/embedded_app.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/demo_launcher/demo_launcher.cc ('k') | mojo/examples/keyboard/keyboard.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/embedded_app/embedded_app.cc
diff --git a/mojo/examples/embedded_app/embedded_app.cc b/mojo/examples/embedded_app/embedded_app.cc
index 7e555cd2be62fee79b1a495563d0f7b0bfa0e500..9fc72ef934d9ff419625cc5c0d17aa5f0da4ab2c 100644
--- a/mojo/examples/embedded_app/embedded_app.cc
+++ b/mojo/examples/embedded_app/embedded_app.cc
@@ -23,14 +23,6 @@
#include "url/gurl.h"
#include "url/url_util.h"
-using mojo::view_manager::Node;
-using mojo::view_manager::NodeObserver;
-using mojo::view_manager::View;
-using mojo::view_manager::ViewManager;
-using mojo::view_manager::ViewManagerDelegate;
-using mojo::view_manager::ViewManagerClientFactory;
-using mojo::view_manager::ViewObserver;
-
namespace mojo {
namespace examples {
class EmbeddedApp;
@@ -141,12 +133,12 @@ class EmbeddedApp : public ApplicationDelegate,
pending_node_colors_.erase(color);
}
- view_manager::ViewManager* view_manager_;
+ ViewManager* view_manager_;
navigation::NavigatorHostPtr navigator_host_;
std::map<Node*, View*> views_to_reap_;
ViewManagerClientFactory view_manager_client_factory_;
- typedef std::map<view_manager::Id, Node*> RootMap;
+ typedef std::map<Id, Node*> RootMap;
RootMap roots_;
// We can receive navigations for nodes we don't have yet.
« no previous file with comments | « mojo/examples/demo_launcher/demo_launcher.cc ('k') | mojo/examples/keyboard/keyboard.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698