Adds additional_client_area to client area

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()))
+  if (!ShouldSendClientAreaToServer())
     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()));
+  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()),
+      std::vector<gfx::Rect>());
 }
 
 void DesktopWindowTreeHostMus::SendHitTestMaskToServer() {
   if (!native_widget_delegate_->HasHitTestMask()) {
     SetHitTestMask(base::nullopt);
     return;
   }
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   SetHitTestMask(mask_rect);
 }
 
 float DesktopWindowTreeHostMus::GetScaleFactor() const {
   // TODO(sky): GetDisplayNearestWindow() should take a const aura::Window*.
   return display::Screen::GetScreen()
       ->GetDisplayNearestWindow(const_cast<aura::Window*>(window()))
       .device_scale_factor();
 }
 
 void DesktopWindowTreeHostMus::SetBoundsInDIP(const gfx::Rect& bounds_in_dip) {
   SetBoundsInPixels(gfx::ConvertRectToPixel(GetScaleFactor(), bounds_in_dip));
 }
 
+bool DesktopWindowTreeHostMus::ShouldSendClientAreaToServer() const {
+  if (!auto_update_client_area_)
+    return false;
+
+  using WIP = views::Widget::InitParams;
+  const WIP::Type type = desktop_native_widget_aura_->widget_type();
+  return type == WIP::TYPE_WINDOW || type == WIP::TYPE_PANEL;
+}
+
 void DesktopWindowTreeHostMus::Init(aura::Window* content_window,
                                     const Widget::InitParams& params) {
   // Needed so we don't render over the non-client area the window manager
   // renders to.
   content_window->layer()->SetFillsBoundsOpaquely(false);
   if (!params.bounds.IsEmpty())
     SetBoundsInDIP(params.bounds);
 
   cursor_manager_ = base::MakeUnique<wm::CursorManager>(
       base::MakeUnique<NativeCursorManagerMus>(window()));
@@ skipping 293 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()))
+  if (!ShouldSendClientAreaToServer())
     return nullptr;
 
   return new ClientSideNonClientFrameView(native_widget_delegate_->AsWidget());
 }
 
 bool DesktopWindowTreeHostMus::ShouldUseNativeFrame() const {
   return false;
 }
 
 bool DesktopWindowTreeHostMus::ShouldWindowContentsBeTransparent() const {
@@ skipping 123 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