1 files changed, 12 insertions, 12 deletions
diff --git a/mandoline/ui/aura/native_widget_view_manager.h b/mandoline/ui/aura/native_widget_view_manager.h
index 22cce85..93b99fd 100644
--- a/mandoline/ui/aura/native_widget_view_manager.h
+++ b/mandoline/ui/aura/native_widget_view_manager.h
@@ -5,7 +5,6 @@
 #ifndef MANDOLINE_UI_AURA_NATIVE_WIDGET_VIEW_MANAGER_H_
 #define MANDOLINE_UI_AURA_NATIVE_WIDGET_VIEW_MANAGER_H_
 
-#include "components/mus/public/cpp/view_observer.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace aura {
@@ -28,12 +27,19 @@ namespace mojo {
 class Shell;
 }
 
+namespace mus {
+class View;
+}
+
 namespace mandoline {
 
+namespace {
+class NativeWidgetViewObserver;
+}
+
 class WindowTreeHostMojo;
 
-class NativeWidgetViewManager : public views::NativeWidgetAura,
-                                public mus::ViewObserver {
+class NativeWidgetViewManager : public views::NativeWidgetAura {
  public:
   NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate,
                           mojo::Shell* shell,
@@ -41,20 +47,14 @@ class NativeWidgetViewManager : public views::NativeWidgetAura,
   ~NativeWidgetViewManager() override;
 
  private:
+  friend class NativeWidgetViewObserver;
+
   // Overridden from internal::NativeWidgetAura:
   void InitNativeWidget(const views::Widget::InitParams& in_params) override;
   void OnWindowVisibilityChanged(aura::Window* window, bool visible) override;
 
-  // ViewObserver:
-  void OnViewDestroyed(mus::View* view) override;
-  void OnViewBoundsChanged(mus::View* view,
-                           const mojo::Rect& old_bounds,
-                           const mojo::Rect& new_bounds) override;
-  void OnViewFocusChanged(mus::View* gained_focus,
-                          mus::View* lost_focus) override;
-  void OnViewInputEvent(mus::View* view, const mojo::EventPtr& event) override;
-
   scoped_ptr<WindowTreeHostMojo> window_tree_host_;
+  scoped_ptr<NativeWidgetViewObserver> view_observer_;
 
   scoped_ptr<wm::FocusController> focus_client_;