| Index: mojo/views/native_widget_view_manager.h
|
| diff --git a/mojo/views/native_widget_view_manager.h b/mojo/views/native_widget_view_manager.h
|
| index 564e4676c8c63e9af159d9624eb5d9a5fb3ceb6b..37096fec0525e4607075153e89a473d6b8c7e84e 100644
|
| --- a/mojo/views/native_widget_view_manager.h
|
| +++ b/mojo/views/native_widget_view_manager.h
|
| @@ -27,11 +27,11 @@ class WindowTreeHostMojo;
|
|
|
| class NativeWidgetViewManager : public views::NativeWidgetAura,
|
| public WindowTreeHostMojoDelegate,
|
| - public view_manager::ViewObserver,
|
| - public view_manager::NodeObserver {
|
| + public ViewObserver,
|
| + public NodeObserver {
|
| public:
|
| NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate,
|
| - view_manager::Node* node);
|
| + Node* node);
|
| virtual ~NativeWidgetViewManager();
|
|
|
| private:
|
| @@ -42,19 +42,18 @@ class NativeWidgetViewManager : public views::NativeWidgetAura,
|
| // WindowTreeHostMojoDelegate:
|
| virtual void CompositorContentsChanged(const SkBitmap& bitmap) OVERRIDE;
|
|
|
| - // view_manager::NodeObserver:
|
| - virtual void OnNodeDestroyed(view_manager::Node* node) OVERRIDE;
|
| - virtual void OnNodeActiveViewChanged(view_manager::Node* node,
|
| - view_manager::View* old_view,
|
| - view_manager::View* new_view) OVERRIDE;
|
| - virtual void OnNodeBoundsChanged(view_manager::Node* node,
|
| + // NodeObserver:
|
| + virtual void OnNodeDestroyed(Node* node) OVERRIDE;
|
| + virtual void OnNodeActiveViewChanged(Node* node,
|
| + View* old_view,
|
| + View* new_view) OVERRIDE;
|
| + virtual void OnNodeBoundsChanged(Node* node,
|
| const gfx::Rect& old_bounds,
|
| const gfx::Rect& new_bounds) OVERRIDE;
|
|
|
| - // view_manager::ViewObserver
|
| - virtual void OnViewInputEvent(view_manager::View* view,
|
| - const EventPtr& event) OVERRIDE;
|
| - virtual void OnViewDestroyed(view_manager::View* view) OVERRIDE;
|
| + // ViewObserver
|
| + virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE;
|
| + virtual void OnViewDestroyed(View* view) OVERRIDE;
|
|
|
| scoped_ptr<WindowTreeHostMojo> window_tree_host_;
|
|
|
| @@ -62,8 +61,8 @@ class NativeWidgetViewManager : public views::NativeWidgetAura,
|
|
|
| scoped_ptr<ui::internal::InputMethodDelegate> ime_filter_;
|
|
|
| - view_manager::Node* node_;
|
| - view_manager::View* view_;
|
| + Node* node_;
|
| + View* view_;
|
|
|
| scoped_ptr<wm::ScopedCaptureClient> capture_client_;
|
|
|
|
|