Converts mash to use the common non-client frame

ash/mus/non_client_frame_controller.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 "ash/mus/non_client_frame_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "ash/common/ash_constants.h"
+#include "ash/common/ash_layout_constants.h"
+#include "ash/common/frame/custom_frame_view_ash.h"
 #include "ash/mus/bridge/wm_window_mus.h"
-#include "ash/mus/frame/frame_border_hit_test_controller.h"
-#include "ash/mus/frame/move_event_handler.h"
-#include "ash/mus/frame/non_client_frame_view_mash.h"
+#include "ash/mus/move_event_handler.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/shadow.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_manager_delegate.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
@@ skipping 90 matching lines @@
       : NativeWidgetMus(delegate, window, ui::mojom::SurfaceType::UNDERLAY),
         window_manager_client_(window_manager_client) {}
   ~WmNativeWidgetMus() override {}
 
   // NativeWidgetMus:
   views::NonClientFrameView* CreateNonClientFrameView() override {
     move_event_handler_.reset(new MoveEventHandler(
         window(), window_manager_client_, GetNativeView()));
     if (ShouldRemoveStandardFrame(window()))
       return new EmptyDraggableNonClientFrameView();
-    return new NonClientFrameViewMash(GetWidget(), window());
+    return new CustomFrameViewAsh(GetWidget());
   }
   void InitNativeWidget(const views::Widget::InitParams& params) override {
     views::NativeWidgetMus::InitNativeWidget(params);
     aura::WindowTreeHost* window_tree_host = GetNativeView()->GetHost();
     // TODO(sky): shadow should be determined by window type and shadow type.
     shadow_.reset(new Shadow);
     shadow_->Init(Shadow::STYLE_INACTIVE);
     shadow_->Install(window());
     ContentWindowLayoutManager* layout_manager = new ContentWindowLayoutManager(
         window_tree_host->window(), shadow_.get());
     window_tree_host->window()->SetLayoutManager(layout_manager);
     const int inset = Shadow::GetInteriorInsetForStyle(Shadow::STYLE_ACTIVE);
     window_tree_host->SetOutputSurfacePadding(
         gfx::Insets(inset, inset, inset, inset));
     window_tree_host->window()->layer()->Add(shadow_->layer());
     shadow_->layer()->parent()->StackAtBottom(shadow_->layer());
   }
-  void CenterWindow(const gfx::Size& size) override {

[sky, 2016/08/08 23:32:27]

These overrides are no longer necessary because of
https://codereview.chromium.org/2225833003/ .

[James Cook, 2016/08/09 00:37:10]

Hooray! No more tricky empty overrides.

-    // Do nothing. The client controls the size, not us.
-  }
-  bool SetWindowTitle(const base::string16& title) override {
-    // Do nothing. The client controls the window title, not us.
-    return false;
-  }
-  void SetWindowIcons(const gfx::ImageSkia& window_icon,
-                      const gfx::ImageSkia& app_icon) override {
-    // Do nothing. The client controls window icons, not us.
-  }
-  void UpdateClientArea() override {
-    // This pushes the client area to the WS. We don't want to do that as
-    // the client area should come from the client, not us.
-  }
 
  private:
   // The shadow, may be null.
   std::unique_ptr<Shadow> shadow_;
 
   std::unique_ptr<MoveEventHandler> move_event_handler_;
 
   ui::WindowManagerClient* window_manager_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WmNativeWidgetMus);
@@ skipping 16 matching lines @@
     frame_controller_->window()->RequestClose();
     return false;
   }
 
  private:
   NonClientFrameController* frame_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientViewMus);
 };
 
+// Returns the frame insets to use when ShouldUseExtendedHitRegion() returns
+// true.
+gfx::Insets GetExtendedHitRegion() {
+  return gfx::Insets(kResizeOutsideBoundsSize, kResizeOutsideBoundsSize,
+                     kResizeOutsideBoundsSize, kResizeOutsideBoundsSize);
+}
+
 }  // namespace
 
 // static
 void NonClientFrameController::Create(
     shell::Connector* connector,
     ui::Window* parent,
     ui::Window* window,
     ui::WindowManagerClient* window_manager_client) {
   new NonClientFrameController(connector, parent, window,
                                window_manager_client);
 }
 
 // static
 gfx::Insets NonClientFrameController::GetPreferredClientAreaInsets() {
-  return NonClientFrameViewMash::GetPreferredClientAreaInsets();
+  // TODO(sky): figure out a better way to get this rather than hard coding.
+  // This value comes from the header (see DefaultHeaderPainter::LayoutHeader,
+  // which uses the preferred height of the CaptionButtonContainer, which uses
+  // the height of the close button).
+  return gfx::Insets(
+      GetAshLayoutSize(AshLayoutSize::NON_BROWSER_CAPTION_BUTTON).height(), 0,
+      0, 0);
 }
 
 // static
 int NonClientFrameController::GetMaxTitleBarButtonWidth() {
-  return NonClientFrameViewMash::GetMaxTitleBarButtonWidth();
+  // TODO(sky): same comment as for GetPreferredClientAreaInsets().
+  return GetAshLayoutSize(AshLayoutSize::NON_BROWSER_CAPTION_BUTTON).width() *
+         3;
 }
 
 NonClientFrameController::NonClientFrameController(
     shell::Connector* connector,
     ui::Window* parent,
     ui::Window* window,
     ui::WindowManagerClient* window_manager_client)
     : widget_(new views::Widget), window_(window) {
   WmWindowMus* wm_window = WmWindowMus::Get(window);
   wm_window->set_widget(widget_, WmWindowMus::WidgetCreationType::FOR_CLIENT);
@@ skipping 11 matching lines @@
       new WmNativeWidgetMus(widget_, window, window_manager_client);
   widget_->Init(params);
 
   parent->AddChild(window);
 
   widget_->ShowInactive();
 
   const int shadow_inset =
       Shadow::GetInteriorInsetForStyle(Shadow::STYLE_ACTIVE);
   const gfx::Insets extended_hit_region =
-      wm_window->ShouldUseExtendedHitRegion()
-          ? FrameBorderHitTestController::GetResizeOutsideBoundsSize()
-          : gfx::Insets();
+      wm_window->ShouldUseExtendedHitRegion() ? GetExtendedHitRegion()
+                                              : gfx::Insets();
   window_manager_client->SetUnderlaySurfaceOffsetAndExtendedHitArea(
       window, gfx::Vector2d(shadow_inset, shadow_inset), extended_hit_region);
 }
 
 NonClientFrameController::~NonClientFrameController() {
   if (window_)
     window_->RemoveObserver(this);
 }
 
 base::string16 NonClientFrameController::GetWindowTitle() const {
@@ skipping 64 matching lines @@
   }
 }
 
 void NonClientFrameController::OnWindowDestroyed(ui::Window* window) {
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace mus
 }  // namespace ash