ash/mash: Add a mus-client that sets up ash to provide the system ui for mash.

ui/views/mus/native_widget_mus.cc

 // Copyright 2015 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.
 
 #include "ui/views/mus/native_widget_mus.h"
 
 #include "base/macros.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
@@ skipping 12 matching lines @@
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/views/mus/platform_window_mus.h"
 #include "ui/views/mus/surface_context_factory.h"
 #include "ui/views/mus/window_manager_constants_converters.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 #include "ui/views/mus/window_tree_host_mus.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/custom_frame_view.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/capture_controller.h"
+#include "ui/wm/core/default_screen_position_client.h"
 #include "ui/wm/core/focus_controller.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(mus::Window*);
 
 namespace views {
 namespace {
 
 DEFINE_WINDOW_PROPERTY_KEY(mus::Window*, kMusWindow, nullptr);
 
 MUS_DEFINE_WINDOW_PROPERTY_KEY(NativeWidgetMus*, kNativeWidgetMusKey, nullptr);
@@ skipping 129 matching lines @@
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMus, public:
 
 NativeWidgetMus::NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
                                  mojo::Shell* shell,
                                  mus::Window* window,
                                  mus::mojom::SurfaceType surface_type)
     : window_(window),
-      shell_(shell),
       native_widget_delegate_(delegate),
       surface_type_(surface_type),
       show_state_before_fullscreen_(ui::PLATFORM_WINDOW_STATE_UNKNOWN),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       content_(new aura::Window(this)),
       close_widget_factory_(this) {
   // TODO(fsamuel): Figure out lifetime of |window_|.
   aura::SetMusWindow(content_, window_);
 
   window->SetLocalProperty(kNativeWidgetMusKey, this);
+  // WindowTreeHost creates the compositor using the ContextFactory from

[sky, 2016/02/08 17:42:15]

Seems better to do initialization in InitNativeWidget. I say this as I suspect
InitNativeWidget is going to get more complicated. How come creating the
WindowTreeHost needed to be here?

[sadrul, 2016/02/08 18:33:24]

We need to install the RootWindowSettings for the WTH's root-window between the
creation of the WTHMus, and the call to InitHost(). (because the call to
InitHost() goes back to the associated gfx::Display (to learn about the
device-scale-factor)).

That is why this CL splits the creation of the WTHMus and the call to
WTH::InitHost(). The injected NativeWidgetFactory can then set-up the
RootWindowSettings object at the right time so that subsequent initialization
can completely correctly.

An alternate approach is to keep this code in
NativeWidgetMus::InitNativeWidget(), but introduce a virtual method which gets
called between the WTH creation and the call to InitHost(), so that (1)
NativeWidgetFactory can create a AshNativeWidgetMus, instead of a
NativeWidgetMus from the WMC, and (2) AshNativeWidgetMus overrides the
introduced virtual method to inject the RWH on the root-window. That feels just
as clunky to me, but happy to do that if you think that's cleaner.

+  // aura::Env. Install |context_factory_| there so that |context_factory_| is
+  // picked up.
+  ui::ContextFactory* default_context_factory =
+      aura::Env::GetInstance()->context_factory();
+  // For Chrome, we need the GpuProcessTransportFactory so that renderer and
+  // browser pixels are composited into a single backing
+  // SoftwareOutputDeviceMus.
+  if (!default_context_factory) {
+    context_factory_.reset(
+        new SurfaceContextFactory(shell, window_, surface_type_));
+    aura::Env::GetInstance()->set_context_factory(context_factory_.get());
+  }
+  window_tree_host_.reset(new WindowTreeHostMus(shell, this, window_));
+  aura::Env::GetInstance()->set_context_factory(default_context_factory);
 }
 
 NativeWidgetMus::~NativeWidgetMus() {
   if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
     delete native_widget_delegate_;
   else
     CloseNow();
 }
 
 // static
 void NativeWidgetMus::NotifyFrameChanged(
     mus::WindowTreeConnection* connection) {
   for (mus::Window* window : connection->GetRoots()) {
     NativeWidgetMus* native_widget =
         window->GetLocalProperty(kNativeWidgetMusKey);
     if (native_widget && native_widget->GetWidget()->non_client_view()) {
       native_widget->GetWidget()->non_client_view()->Layout();
       native_widget->GetWidget()->non_client_view()->SchedulePaint();
       native_widget->UpdateClientArea();
     }
   }
 }
 
+aura::Window* NativeWidgetMus::GetRootWindow() {
+  return window_tree_host_->window();
+}
+
 void NativeWidgetMus::OnPlatformWindowClosed() {
   native_widget_delegate_->OnNativeWidgetDestroying();
 
   window_tree_client_.reset();  // Uses |content_|.
   capture_client_.reset();      // Uses |content_|.
 
   window_tree_host_->RemoveObserver(this);
   window_tree_host_.reset();
 
   window_ = nullptr;
@@ skipping 59 matching lines @@
 
 NonClientFrameView* NativeWidgetMus::CreateNonClientFrameView() {
   return new ClientSideNonClientFrameView(GetWidget());
 }
 
 void NativeWidgetMus::InitNativeWidget(const Widget::InitParams& params) {
   ownership_ = params.ownership;
   window_->SetCanFocus(params.activatable ==
                        Widget::InitParams::ACTIVATABLE_YES);
 
-  // WindowTreeHost creates the compositor using the ContextFactory from
-  // aura::Env. Install |context_factory_| there so that |context_factory_| is
-  // picked up.
-  ui::ContextFactory* default_context_factory =
-      aura::Env::GetInstance()->context_factory();
-  // For Chrome, we need the GpuProcessTransportFactory so that renderer and
-  // browser pixels are composited into a single backing
-  // SoftwareOutputDeviceMus.
-  if (!default_context_factory) {
-    if (!context_factory_) {
-      context_factory_.reset(new SurfaceContextFactory(shell_, window_,
-                                                       surface_type_));
-    }
-    aura::Env::GetInstance()->set_context_factory(context_factory_.get());
-  }
-  window_tree_host_.reset(new WindowTreeHostMus(shell_, this, window_));
   window_tree_host_->AddObserver(this);
   window_tree_host_->InitHost();
-  aura::Env::GetInstance()->set_context_factory(default_context_factory);
   window_tree_host_->window()->SetProperty(kMusWindow, window_);
 
   focus_client_.reset(new wm::FocusController(new FocusRulesImpl));
 
   aura::client::SetFocusClient(window_tree_host_->window(),
                                focus_client_.get());
   aura::client::SetActivationClient(window_tree_host_->window(),
                                     focus_client_.get());
+  screen_position_client_.reset(new wm::DefaultScreenPositionClient());
+  aura::client::SetScreenPositionClient(window_tree_host_->window(),
+                                        screen_position_client_.get());
+
   window_tree_client_.reset(
       new NativeWidgetMusWindowTreeClient(window_tree_host_->window()));
   window_tree_host_->window()->AddPreTargetHandler(focus_client_.get());
   window_tree_host_->window()->SetLayoutManager(
       new ContentWindowLayoutManager(window_tree_host_->window(), content_));
   capture_client_.reset(
       new aura::client::DefaultCaptureClient(window_tree_host_->window()));
 
   content_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   content_->Init(ui::LAYER_TEXTURED);
@@ skipping 516 matching lines @@
 
 void NativeWidgetMus::OnGestureEvent(ui::GestureEvent* event) {
   native_widget_delegate_->OnGestureEvent(event);
 }
 
 void NativeWidgetMus::OnHostCloseRequested(const aura::WindowTreeHost* host) {
   GetWidget()->Close();
 }
 
 }  // namespace views