Adds a factory function to ViewsDelegate for DesktopWindowTreeHost

ui/views/mus/mus_client.h

 // Copyright 2016 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_MUS_MUS_CLIENT_H_
 #define UI_VIEWS_MUS_MUS_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 26 matching lines @@
 namespace service_manager {
 class Connector;
 }
 
 namespace wm {
 class WMState;
 }
 
 namespace views {
 
+class DesktopNativeWidgetAura;
 class MusClientObserver;
 class MusPropertyMirror;
 class PointerWatcherEventRouter;
 class ScreenMus;
 
 namespace internal {
 class NativeWidgetDelegate;
 }
 
 namespace test {
@@ skipping 34 matching lines @@
 
   PointerWatcherEventRouter* pointer_watcher_event_router() {
     return pointer_watcher_event_router_.get();
   }
 
   // Creates DesktopNativeWidgetAura with DesktopWindowTreeHostMus. This is
   // set as the factory function used for creating NativeWidgets when a
   //  NativeWidget has not been explicitly set.
   NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params,
                                    internal::NativeWidgetDelegate* delegate);
-
   // Called when the capture client has been set for a window to notify
   // PointerWatcherEventRouter and CaptureSynchronizer.
   void OnCaptureClientSet(aura::client::CaptureClient* capture_client);
 
   // Called when the capture client will be unset for a window to notify
   // PointerWatcherEventRouter and CaptureSynchronizer.
   void OnCaptureClientUnset(aura::client::CaptureClient* capture_client);
 
   void AddObserver(MusClientObserver* observer);
   void RemoveObserver(MusClientObserver* observer);
 
   void SetMusPropertyMirror(std::unique_ptr<MusPropertyMirror> mirror);
   MusPropertyMirror* mus_property_mirror() {
     return mus_property_mirror_.get();
   }
 
  private:
   friend class AuraInit;
   friend class test::MusClientTestApi;
 
+  // Creates a DesktopWindowTreeHostMus. This is set as the factory function
+  // ViewsDelegate such that if DesktopNativeWidgetAura is created without a
+  // DesktopWindowTreeHost this is created.
+  std::unique_ptr<DesktopWindowTreeHost> CreateDesktopWindowTreeHost(
+      const Widget::InitParams& init_params,
+      internal::NativeWidgetDelegate* delegate,
+      DesktopNativeWidgetAura* desktop_native_widget_aura);
+
   // aura::WindowTreeClientDelegate:
   void OnEmbed(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
   void OnLostConnection(aura::WindowTreeClient* client) override;
   void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               aura::Window* target) override;
   aura::PropertyConverter* GetPropertyConverter() override;
 
   // ScreenMusDelegate:
@@ skipping 23 matching lines @@
 
   std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager>
       discardable_shared_memory_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MusClient);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_MUS_CLIENT_H_