Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: mash/wm/frame/frame_border_hit_test_controller.cc

Issue 2029883002: Moves mash/wm into ash/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_static_assert
Patch Set: move comment Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mash/wm/frame/frame_border_hit_test_controller.h ('k') | mash/wm/frame/header_painter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/frame/frame_border_hit_test_controller.cc
diff --git a/mash/wm/frame/frame_border_hit_test_controller.cc b/mash/wm/frame/frame_border_hit_test_controller.cc
deleted file mode 100644
index 4ea847f8cbdd9d37527631c12d1ab1d3b4e26825..0000000000000000000000000000000000000000
--- a/mash/wm/frame/frame_border_hit_test_controller.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-// 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 "mash/wm/frame/frame_border_hit_test_controller.h"
-
-#include "mash/wm/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ui/aura/env.h"
-#include "ui/aura/window.h"
-#include "ui/base/hit_test.h"
-#include "ui/gfx/geometry/insets.h"
-#include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_delegate.h"
-#include "ui/views/window/non_client_view.h"
-
-namespace mash {
-namespace wm {
-
-// In the window corners, the resize areas don't actually expand bigger, but the
-// 16 px at the end of each edge triggers diagonal resizing.
-const int kResizeAreaCornerSize = 16;
-
-// Windows do not have a traditional visible window frame. Window content
-// extends to the edge of the window. We consider a small region outside the
-// window bounds and an even smaller region overlapping the window to be the
-// "non-client" area and use it for resizing.
-const int kResizeOutsideBoundsSize = 6;
-const int kResizeOutsideBoundsScaleForTouch = 5;
-const int kResizeInsideBoundsSize = 1;
-
-// static
-gfx::Insets FrameBorderHitTestController::GetResizeOutsideBoundsSize() {
- return gfx::Insets(kResizeOutsideBoundsSize, kResizeOutsideBoundsSize,
- kResizeOutsideBoundsSize, kResizeOutsideBoundsSize);
-}
-
-// static
-int FrameBorderHitTestController::NonClientHitTest(
- views::NonClientFrameView* view,
- FrameCaptionButtonContainerView* caption_button_container,
- const gfx::Point& point_in_widget) {
- gfx::Rect expanded_bounds = view->bounds();
- int outside_bounds = kResizeOutsideBoundsSize;
-
- if (aura::Env::GetInstance()->is_touch_down())
- outside_bounds *= kResizeOutsideBoundsScaleForTouch;
- expanded_bounds.Inset(-outside_bounds, -outside_bounds);
-
- if (!expanded_bounds.Contains(point_in_widget))
- return HTNOWHERE;
-
- // Check the frame first, as we allow a small area overlapping the contents
- // to be used for resize handles.
- views::Widget* frame = view->GetWidget();
- bool can_ever_resize = frame->widget_delegate()->CanResize();
- // Don't allow overlapping resize handles when the window is maximized or
- // fullscreen, as it can't be resized in those states.
- int resize_border = kResizeInsideBoundsSize;
- if (frame->IsMaximized() || frame->IsFullscreen()) {
- resize_border = 0;
- can_ever_resize = false;
- }
- int frame_component = view->GetHTComponentForFrame(
- point_in_widget, resize_border, resize_border, kResizeAreaCornerSize,
- kResizeAreaCornerSize, can_ever_resize);
- if (frame_component != HTNOWHERE)
- return frame_component;
-
- int client_component =
- frame->client_view()->NonClientHitTest(point_in_widget);
- if (client_component != HTNOWHERE)
- return client_component;
-
- if (caption_button_container->visible()) {
- gfx::Point point_in_caption_button_container(point_in_widget);
- views::View::ConvertPointFromWidget(caption_button_container,
- &point_in_caption_button_container);
- int caption_button_component = caption_button_container->NonClientHitTest(
- point_in_caption_button_container);
- if (caption_button_component != HTNOWHERE)
- return caption_button_component;
- }
-
- // Caption is a safe default.
- return HTCAPTION;
-}
-
-} // namespace wm
-} // namespace mash
« no previous file with comments | « mash/wm/frame/frame_border_hit_test_controller.h ('k') | mash/wm/frame/header_painter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698