Moves creation of various clients to DesktopNativeWidgetAura

ui/views/widget/desktop_aura/desktop_native_widget_aura.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
 
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/drag_drop_delegate.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/views/ime/input_method_delegate.h"
 #include "ui/views/widget/native_widget_private.h"
 
 namespace aura {
 class RootWindow;
 namespace client {
+class DragDropClient;
+class FocusClient;
+class ScreenPositionClient;
 class WindowTreeClient;
 }
 }
 
 namespace views {
 
 namespace corewm {
 class CompoundEventFilter;
+class CursorManager;
 class InputMethodEventFilter;
 class ShadowController;
 class TooltipController;
 class VisibilityController;
 class WindowModalityController;
 }
 
 class DesktopCaptureClient;
+class DesktopDispatcherClient;
 class DesktopRootWindowHost;
 class DropHelper;
 class TooltipManagerAura;
 class WindowReorderer;
 
 class VIEWS_EXPORT DesktopNativeWidgetAura
     : public internal::NativeWidgetPrivate,
       public aura::WindowDelegate,
       public aura::client::ActivationDelegate,
       public aura::client::ActivationChangeObserver,
       public aura::client::FocusChangeObserver,
       public views::internal::InputMethodDelegate,
       public aura::client::DragDropDelegate,
       public aura::RootWindowObserver {
  public:
   explicit DesktopNativeWidgetAura(internal::NativeWidgetDelegate* delegate);
   virtual ~DesktopNativeWidgetAura();
 
   // Maps from window to DesktopNativeWidgetAura.
   static DesktopNativeWidgetAura* ForWindow(aura::Window* window);
 
   // Called by our DesktopRootWindowHost after it has deleted native resources;
   // this is the signal that we should start our shutdown.
   virtual void OnHostClosed();
 
-  // Installs the input method filter on |root|. This is intended to be invoked
-  // by the DesktopRootWindowHost implementation during Init().
-  void InstallInputMethodEventFilter(aura::RootWindow* root);
+  // Called from ~DesktopRootWindowHost. This takes the RootWindow as by the
+  // time we get here |root_window_| is NULL.
+  virtual void OnDesktopRootWindowHostDestroyed(aura::RootWindow* root);
+
   corewm::InputMethodEventFilter* input_method_event_filter() {
     return input_method_event_filter_.get();
   }
   corewm::CompoundEventFilter* root_window_event_filter() {
     return root_window_event_filter_;
   }
 
-  // Invoked from DesktopRootWindowHost creation to create the CaptureClient.
-  void CreateCaptureClient(aura::RootWindow* root);
-
   // Overridden from NativeWidget:
   virtual ui::EventHandler* GetEventHandler() OVERRIDE;
 
   // Ensures that the correct window is activated/deactivated based on whether
   // we are being activated/deactivated.
   void HandleActivationChanged(bool active);
 
-  // Installs the window modality controller event filter on the |root|. This
-  // should be invoked by the DesktopRootWindowHost implementation immediately
-  // after creation of the RootWindow.
-  void InstallWindowModalityController(aura::RootWindow* root);
-
  protected:
   // Overridden from internal::NativeWidgetPrivate:
   virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE;
   virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
   virtual bool ShouldUseNativeFrame() const OVERRIDE;
   virtual void FrameTypeChanged() OVERRIDE;
   virtual Widget* GetWidget() OVERRIDE;
   virtual const Widget* GetWidget() const OVERRIDE;
   virtual gfx::NativeView GetNativeView() const OVERRIDE;
   virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
@@ skipping 120 matching lines @@
   virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
 
   // Overridden from aura::RootWindowObserver:
   virtual void OnRootWindowHostCloseRequested(
       const aura::RootWindow* root) OVERRIDE;
   virtual void OnRootWindowHostResized(const aura::RootWindow* root) OVERRIDE;
   virtual void OnRootWindowHostMoved(const aura::RootWindow* root,
                                      const gfx::Point& new_origin) OVERRIDE;
 
  private:
+  // Installs the input method filter.
+  void InstallInputMethodEventFilter();
+
   // To save a clear on platforms where the window is never transparent, the
   // window is only set as transparent when the glass frame is in use.
   void UpdateWindowTransparency();
 
   // See class documentation for Widget in widget.h for a note about ownership.
   Widget::InitParams::Ownership ownership_;
 
   scoped_ptr<DesktopCaptureClient> capture_client_;
 
   // The NativeWidget owns the RootWindow. Required because the RootWindow owns
@@ skipping 13 matching lines @@
   // Child of the root, contains |content_window_|.
   aura::Window* content_window_container_;
 
   // Child of |content_window_container_|. This is the return value from
   // GetNativeView().
   // WARNING: this may be NULL, in particular during shutdown it becomes NULL.
   aura::Window* content_window_;
 
   internal::NativeWidgetDelegate* native_widget_delegate_;
 
+  scoped_ptr<aura::client::FocusClient> focus_client_;
+  scoped_ptr<DesktopDispatcherClient> dispatcher_client_;
+  scoped_ptr<views::corewm::CursorManager> cursor_client_;
+  scoped_ptr<aura::client::ScreenPositionClient> position_client_;
+  scoped_ptr<aura::client::DragDropClient> drag_drop_client_;
   scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
 
   // Toplevel event filter which dispatches to other event filters.
   corewm::CompoundEventFilter* root_window_event_filter_;
 
   scoped_ptr<corewm::InputMethodEventFilter> input_method_event_filter_;
 
   scoped_ptr<DropHelper> drop_helper_;
   int last_drop_operation_;
 
@@ skipping 18 matching lines @@
 
   // See class documentation for Widget in widget.h for a note about type.
   Widget::InitParams::Type widget_type_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_