Makes windowmanager draw non-client area

components/mus/example/wm/move_loop.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 "components/mus/example/wm/move_loop.h"
 
 #include "base/auto_reset.h"
 #include "components/mus/example/wm/property_util.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/input_event_constants.mojom.h"
@@ skipping 13 matching lines @@
                   event.pointer_data->location->screen_y));
 }
 
 mus::mojom::EventFlags MouseOnlyEventFlags(mus::mojom::EventFlags flags) {
   return static_cast<mus::mojom::EventFlags>(
       flags & (mus::mojom::EVENT_FLAGS_LEFT_MOUSE_BUTTON |
                mus::mojom::EVENT_FLAGS_MIDDLE_MOUSE_BUTTON |
                mus::mojom::EVENT_FLAGS_RIGHT_MOUSE_BUTTON));
 }
 
+gfx::Rect ClientAreaBounds(const mus::Window* window) {
+  gfx::Rect client_area(window->bounds().size());
+  client_area.Inset(window->client_area());
+  return client_area;
+}
+
 }  // namespace
 
 MoveLoop::~MoveLoop() {
   if (target_)
     target_->RemoveObserver(this);
 }
 
 // static
 scoped_ptr<MoveLoop> MoveLoop::Create(mus::Window* target,
                                       const mus::mojom::Event& event) {
   DCHECK_EQ(event.action, mus::mojom::EVENT_TYPE_POINTER_DOWN);
   const gfx::Point location(EventLocationToPoint(event));
   if (!gfx::Rect(target->bounds().size()).Contains(location) ||
-      target->client_area().Contains(location)) {
+      ClientAreaBounds(target).Contains(location)) {
     return nullptr;
   }
 
   // Start a move on left mouse, or any other type of pointer.
   if (event.pointer_data->kind == mus::mojom::POINTER_KIND_MOUSE &&
       MouseOnlyEventFlags(event.flags) !=
           mus::mojom::EVENT_FLAGS_LEFT_MOUSE_BUTTON) {
     return nullptr;
   }
 
@@ skipping 58 matching lines @@
                              const gfx::Point& location,
                              Type* type,
                              HorizontalLocation* h_loc,
                              VerticalLocation* v_loc) {
   *h_loc = HorizontalLocation::OTHER;
   *v_loc = VerticalLocation::OTHER;
   const int resize_size = static_cast<int>(
       kResizeSize *
       std::max(1.f, target->viewport_metrics().device_pixel_ratio));
 
-  if (location.x() < target->client_area().x())
+  const gfx::Rect client_area(ClientAreaBounds(target));
+  if (location.x() < client_area.x())
     *h_loc = HorizontalLocation::LEFT;
-  else if (location.x() >= target->client_area().right())
+  else if (location.x() >= client_area.right())
     *h_loc = HorizontalLocation::RIGHT;
   else
     *h_loc = HorizontalLocation::OTHER;
 
   if (location.y() < resize_size)
     *v_loc = VerticalLocation::TOP;
-  else if (location.y() >= target->client_area().bottom())
+  else if (location.y() >= client_area.bottom())
     *v_loc = VerticalLocation::BOTTOM;
   else
     *v_loc = VerticalLocation::OTHER;
 
   if (*v_loc == VerticalLocation::OTHER && location.y() >= resize_size &&
       *h_loc == HorizontalLocation::OTHER) {
     *type = Type::MOVE;
     return;
   }
   *type = Type::RESIZE;
@@ skipping 61 matching lines @@
                                      const gfx::Rect& new_bounds) {
   DCHECK_EQ(window, target_);
   if (!changing_bounds_)
     Cancel();
 }
 
 void MoveLoop::OnWindowVisibilityChanged(mus::Window* window) {
   DCHECK_EQ(window, target_);
   Cancel();
 }