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

Unified Diff: mojo/aura/window_tree_host_mojo.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 | « no previous file | mojo/aura/window_tree_host_mojo.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/aura/window_tree_host_mojo.h
diff --git a/mojo/aura/window_tree_host_mojo.h b/mojo/aura/window_tree_host_mojo.h
index 0aa871b7d26d414be01925a86199fa0a2f1fb3f0..026253a071732aa3d14ea2c96805c25556c71ed7 100644
--- a/mojo/aura/window_tree_host_mojo.h
+++ b/mojo/aura/window_tree_host_mojo.h
@@ -22,10 +22,9 @@ class WindowTreeHostMojoDelegate;
class WindowTreeHostMojo : public aura::WindowTreeHost,
public ui::EventSource,
- public view_manager::NodeObserver {
+ public NodeObserver {
public:
- WindowTreeHostMojo(view_manager::Node* node,
- WindowTreeHostMojoDelegate* delegate);
+ WindowTreeHostMojo(Node* node, WindowTreeHostMojoDelegate* delegate);
virtual ~WindowTreeHostMojo();
// Returns the WindowTreeHostMojo for the specified compositor.
@@ -60,13 +59,13 @@ class WindowTreeHostMojo : public aura::WindowTreeHost,
// ui::EventSource:
virtual ui::EventProcessor* GetEventProcessor() OVERRIDE;
- // view_manager::NodeObserver:
+ // NodeObserver:
virtual void OnNodeBoundsChanged(
- view_manager::Node* node,
+ Node* node,
const gfx::Rect& old_bounds,
const gfx::Rect& new_bounds) OVERRIDE;
- view_manager::Node* node_;
+ Node* node_;
gfx::Rect bounds_;
« no previous file with comments | « no previous file | mojo/aura/window_tree_host_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698