| Index: mandoline/ui/aura/native_widget_view_manager.h
 | 
| diff --git a/mandoline/ui/aura/native_widget_view_manager.h b/mandoline/ui/aura/native_widget_view_manager.h
 | 
| index 83fb556abedd8e2fe0d1e0dbec517830a818b78d..22cce85998936292e3c22cc4d4bed9229da5e872 100644
 | 
| --- a/mandoline/ui/aura/native_widget_view_manager.h
 | 
| +++ b/mandoline/ui/aura/native_widget_view_manager.h
 | 
| @@ -33,11 +33,11 @@ namespace mandoline {
 | 
|  class WindowTreeHostMojo;
 | 
|  
 | 
|  class NativeWidgetViewManager : public views::NativeWidgetAura,
 | 
| -                                public mojo::ViewObserver {
 | 
| +                                public mus::ViewObserver {
 | 
|   public:
 | 
|    NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate,
 | 
|                            mojo::Shell* shell,
 | 
| -                          mojo::View* view);
 | 
| +                          mus::View* view);
 | 
|    ~NativeWidgetViewManager() override;
 | 
|  
 | 
|   private:
 | 
| @@ -46,19 +46,19 @@ class NativeWidgetViewManager : public views::NativeWidgetAura,
 | 
|    void OnWindowVisibilityChanged(aura::Window* window, bool visible) override;
 | 
|  
 | 
|    // ViewObserver:
 | 
| -  void OnViewDestroyed(mojo::View* view) override;
 | 
| -  void OnViewBoundsChanged(mojo::View* view,
 | 
| +  void OnViewDestroyed(mus::View* view) override;
 | 
| +  void OnViewBoundsChanged(mus::View* view,
 | 
|                             const mojo::Rect& old_bounds,
 | 
|                             const mojo::Rect& new_bounds) override;
 | 
| -  void OnViewFocusChanged(mojo::View* gained_focus,
 | 
| -                          mojo::View* lost_focus) override;
 | 
| -  void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) 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<wm::FocusController> focus_client_;
 | 
|  
 | 
| -  mojo::View* view_;
 | 
| +  mus::View* view_;
 | 
|  
 | 
|    scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
 | 
|  
 | 
| 
 |