Adds DesktopWindowTreeHostMus

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 <string>
 
 #include "base/macros.h"
@@ skipping 50 matching lines @@
       public aura::client::DragDropDelegate,
       public aura::WindowTreeHostObserver {
  public:
   explicit DesktopNativeWidgetAura(internal::NativeWidgetDelegate* delegate);
   ~DesktopNativeWidgetAura() override;
 
   // Maps from window to DesktopNativeWidgetAura. |window| must be a root
   // window.
   static DesktopNativeWidgetAura* ForWindow(aura::Window* window);
 
+  // Used to explicitly set a DesktopWindowTreeHost. Must be called before
+  // InitNativeWidget().
+  void SetDesktopWindowTreeHost(
+      std::unique_ptr<DesktopWindowTreeHost> desktop_window_tree_host);
+
   // Called by our DesktopWindowTreeHost after it has deleted native resources;
   // this is the signal that we should start our shutdown.
   virtual void OnHostClosed();
 
   // TODO(beng): remove this method and replace with an implementation of
   //             WindowDestroying() that takes the window being destroyed.
   // Called from ~DesktopWindowTreeHost. This takes the WindowEventDispatcher
   // as by the time we get here |dispatcher_| is NULL.
   virtual void OnDesktopWindowTreeHostDestroyed(aura::WindowTreeHost* host);
 
@@ skipping 201 matching lines @@
 
   gfx::NativeCursor cursor_;
   // We must manually reference count the number of users of |cursor_manager_|
   // because the cursors created by |cursor_manager_| are shared among the
   // DNWAs. We can't just stuff this in a LazyInstance because we need to
   // destroy this as the last DNWA happens; we can't put it off until
   // (potentially) after we tear down the X11 connection because that's a
   // crash.
   static int cursor_reference_count_;
   static wm::CursorManager* cursor_manager_;
-  static views::DesktopNativeCursorManager* native_cursor_manager_;
+  static DesktopNativeCursorManager* native_cursor_manager_;
 
   std::unique_ptr<wm::ShadowController> shadow_controller_;
 
   // Reorders child windows of |window_| associated with a view based on the
   // order of the associated views in the widget's view hierarchy.
   std::unique_ptr<WindowReorderer> window_reorderer_;
 
   // See class documentation for Widget in widget.h for a note about type.
   Widget::InitParams::Type widget_type_;
 
   // The following factory is used for calls to close the NativeWidgetAura
   // instance.
   base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_