Converts some services to use aura-mus

ui/views/mus/desktop_window_tree_host_mus.cc

 // 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.
 
 #include "ui/views/mus/desktop_window_tree_host_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/drag_drop_client.h"
@@ skipping 13 matching lines @@
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/cursor_manager.h"
 #include "ui/wm/core/native_cursor_manager.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace views {
 
 namespace {
 
+bool ShouldSetClientArea(views::Widget::InitParams::Type type) {
+  using WIP = views::Widget::InitParams;
+  return type == WIP::TYPE_WINDOW || type == WIP::TYPE_PANEL;
+}
+
 // As the window manager renderers the non-client decorations this class does
 // very little but honor the client area insets from the window manager.
 class ClientSideNonClientFrameView : public NonClientFrameView {
  public:
   explicit ClientSideNonClientFrameView(views::Widget* widget)
       : widget_(widget) {}
   ~ClientSideNonClientFrameView() override {}
 
  private:
   // Returns the default values of client area insets from the window manager.
@@ skipping 145 matching lines @@
   aura::Env::GetInstance()->RemoveObserver(this);
   desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
 }
 
 bool DesktopWindowTreeHostMus::IsDocked() const {
   return window()->GetProperty(aura::client::kShowStateKey) ==
          ui::SHOW_STATE_DOCKED;
 }
 
 void DesktopWindowTreeHostMus::SendClientAreaToServer() {
+  if (!ShouldSetClientArea(desktop_native_widget_aura_->widget_type()))
+    return;
+
   NonClientView* non_client_view =
       native_widget_delegate_->AsWidget()->non_client_view();
   if (!non_client_view || !non_client_view->client_view())
     return;
 
   const gfx::Rect client_area_rect(non_client_view->client_view()->bounds());
   SetClientArea(gfx::Insets(
       client_area_rect.y(), client_area_rect.x(),
       non_client_view->bounds().height() - client_area_rect.bottom(),
       non_client_view->bounds().width() - client_area_rect.right()));
@@ skipping 39 matching lines @@
 
 void DesktopWindowTreeHostMus::OnNativeWidgetCreated(
     const Widget::InitParams& params) {
   if (params.parent && params.parent->GetHost()) {
     parent_ = static_cast<DesktopWindowTreeHostMus*>(params.parent->GetHost());
     parent_->children_.insert(this);
   }
   native_widget_delegate_->OnNativeWidgetCreated(true);
 }
 
+void DesktopWindowTreeHostMus::OnWidgetInitDone() {
+  // Because of construction order it's possible the bounds have changed before
+  // the NonClientView was created, which means we may not have sent the
+  // client-area and hit-test-mask.
+  SendClientAreaToServer();
+  SendHitTestMaskToServer();
+}
+
 std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostMus::CreateTooltip() {
   return base::MakeUnique<corewm::TooltipAura>();
 }
 
 std::unique_ptr<aura::client::DragDropClient>
 DesktopWindowTreeHostMus::CreateDragDropClient(
     DesktopNativeCursorManager* cursor_manager) {
   // aura-mus handles installing a DragDropClient.
   return nullptr;
 }
@@ skipping 262 matching lines @@
 void DesktopWindowTreeHostMus::EndMoveLoop() {
   NOTIMPLEMENTED();
 }
 
 void DesktopWindowTreeHostMus::SetVisibilityChangedAnimationsEnabled(
     bool value) {
   window()->SetProperty(aura::client::kAnimationsDisabledKey, !value);
 }
 
 NonClientFrameView* DesktopWindowTreeHostMus::CreateNonClientFrameView() {
+  if (!ShouldSetClientArea(desktop_native_widget_aura_->widget_type()))
+    return nullptr;
+
   return new ClientSideNonClientFrameView(native_widget_delegate_->AsWidget());
 }
 
 bool DesktopWindowTreeHostMus::ShouldUseNativeFrame() const {
   return false;
 }
 
 bool DesktopWindowTreeHostMus::ShouldWindowContentsBeTransparent() const {
   return false;
 }
@@ skipping 120 matching lines @@
   if (window == this->window()) {
     is_active_ = true;
     desktop_native_widget_aura_->HandleActivationChanged(true);
   } else if (is_active_) {
     is_active_ = false;
     desktop_native_widget_aura_->HandleActivationChanged(false);
   }
 }
 
 }  // namespace views