Support app window draggable areas in mash.

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/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/property_util.h"
 #include "ash/mus/shadow.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_manager_delegate.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace mus {
 namespace {
 
 // LayoutManager associated with the window created by WindowTreeHost. Resizes
@@ skipping 37 matching lines @@
                       const gfx::Rect& requested_bounds) override {
     SetChildBoundsDirect(child, requested_bounds);
   }
 
   aura::Window* window_;
   Shadow* shadow_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentWindowLayoutManager);
 };
 
+// This class supports draggable regions for windows with non-standard frames.

[James Cook, 2016/06/14 23:44:56]

Nice class comment.

optional: Maybe cite an example of one of these windows?

and/or clarify that "non-standard frames" usually means that the window draws
its own frame, like some packaged apps?

[msw, 2016/06/15 17:06:40]

Done.

+// It uses empty insets, doesn't paint anything, and hit tests return HTCAPTION.
+class StubNonClientFrameView : public views::NonClientFrameView {

[James Cook, 2016/06/14 23:44:56]

optional: I wish there was a better name for this. EmptyNonClientFrameView? Or
failing that, NonClientFrameViewStub? AlwaysDragNonClientFrameView?  Dunno.

[msw, 2016/06/15 17:06:40]

Went with EmptyDraggableNonClientFrameView, but I'm open to revision.

[James Cook, 2016/06/15 23:21:13]

SGTM

+ public:
+  StubNonClientFrameView() {}
+  ~StubNonClientFrameView() override {}
+
+  // views::NonClientFrameView:
+  gfx::Rect GetBoundsForClientView() const override { return bounds(); }
+  gfx::Rect GetWindowBoundsForClientBounds(
+      const gfx::Rect& client_bounds) const override {
+    return bounds();
+  }
+  int NonClientHitTest(const gfx::Point& point) override { return HTCAPTION; }
+  void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override {}
+  void ResetWindowControls() override {}
+  void UpdateWindowIcon() override {}
+  void UpdateWindowTitle() override {}
+  void SizeConstraintsChanged() override {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(StubNonClientFrameView);
+};
+
 class WmNativeWidgetMus : public views::NativeWidgetMus {
  public:
   WmNativeWidgetMus(views::internal::NativeWidgetDelegate* delegate,
                     shell::Connector* connector,
                     ::mus::Window* window,
                     ::mus::WindowManagerClient* window_manager_client)
       : NativeWidgetMus(delegate,
                         connector,
                         window,
                         ::mus::mojom::SurfaceType::UNDERLAY),
         window_manager_client_(window_manager_client) {}
   ~WmNativeWidgetMus() override {}
 
   // NativeWidgetMus:
   views::NonClientFrameView* CreateNonClientFrameView() override {
-    views::Widget* widget =
-        static_cast<views::internal::NativeWidgetPrivate*>(this)->GetWidget();
-    NonClientFrameViewMash* frame_view =
-        new NonClientFrameViewMash(widget, window());
     move_event_handler_.reset(new MoveEventHandler(
         window(), window_manager_client_, GetNativeView()));
-    return frame_view;
+    if (ShouldRemoveStandardFrame(window()))
+      return new StubNonClientFrameView();
+    return new NonClientFrameViewMash(GetWidget(), window());
   }
   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());
@@ skipping 187 matching lines @@
   }
 }
 
 void NonClientFrameController::OnWindowDestroyed(::mus::Window* window) {
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace mus
 }  // namespace ash