From 521c703f8d62fa698c3e88287c64d8d23f9ac675 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Thu, 13 Mar 2014 15:31:49 +0000 Subject: Move wm/core to wm namespace. Also sets up new targets for wm_core, wm_core_unittests, etc. R=sky@chromium.org TBR=sky@chromium.org BUG= Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256680 Review URL: https://codereview.chromium.org/196063002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256839 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/wm/public/easy_resize_window_targeter.h | 52 ------------------------------ ui/wm/public/masked_window_targeter.h | 39 ---------------------- 2 files changed, 91 deletions(-) delete mode 100644 ui/wm/public/easy_resize_window_targeter.h delete mode 100644 ui/wm/public/masked_window_targeter.h (limited to 'ui/wm/public') diff --git a/ui/wm/public/easy_resize_window_targeter.h b/ui/wm/public/easy_resize_window_targeter.h deleted file mode 100644 index f873509..0000000 --- a/ui/wm/public/easy_resize_window_targeter.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2014 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. - -#ifndef UI_WM_PUBLIC_EASY_RESIZE_WINDOW_TARGETER_H_ -#define UI_WM_PUBLIC_EASY_RESIZE_WINDOW_TARGETER_H_ - -#include "ui/aura/window_targeter.h" -#include "ui/gfx/geometry/insets.h" - -namespace wm { - -// An EventTargeter for a container window that uses a slightly larger -// hit-target region for easier resize. -class EasyResizeWindowTargeter : public aura::WindowTargeter { - public: - // |container| window is the owner of this targeter. - EasyResizeWindowTargeter(aura::Window* container, - const gfx::Insets& mouse_extend, - const gfx::Insets& touch_extend); - - virtual ~EasyResizeWindowTargeter(); - - protected: - void set_mouse_extend(const gfx::Insets& mouse_extend) { - mouse_extend_ = mouse_extend; - } - - void set_touch_extend(const gfx::Insets& touch_extend) { - touch_extend_ = touch_extend; - } - - // aura::WindowTargeter: - virtual bool EventLocationInsideBounds( - aura::Window* window, - const ui::LocatedEvent& event) const OVERRIDE; - - private: - // Returns true if the hit testing (EventLocationInsideBounds()) should use - // the extended bounds. - bool ShouldUseExtendedBounds(const aura::Window* window) const; - - aura::Window* container_; - gfx::Insets mouse_extend_; - gfx::Insets touch_extend_; - - DISALLOW_COPY_AND_ASSIGN(EasyResizeWindowTargeter); -}; - -} // namespace wm - -#endif // UI_WM_PUBLIC_EASY_RESIZE_WINDOW_TARGETER_H_ diff --git a/ui/wm/public/masked_window_targeter.h b/ui/wm/public/masked_window_targeter.h deleted file mode 100644 index ad3140d3..0000000 --- a/ui/wm/public/masked_window_targeter.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2014 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. - -#ifndef UI_WM_PUBLIC_MASKED_WINDOW_TARGETER_H_ -#define UI_WM_PUBLIC_MASKED_WINDOW_TARGETER_H_ - -#include "ui/aura/window_targeter.h" - -namespace gfx { -class Path; -} - -namespace wm { - -class MaskedWindowTargeter : public aura::WindowTargeter { - public: - explicit MaskedWindowTargeter(aura::Window* masked_window); - virtual ~MaskedWindowTargeter(); - - protected: - // Sets the hit-test mask for |window| in |mask| (in |window|'s local - // coordinate system). Returns whether a valid mask has been set in |mask|. - virtual bool GetHitTestMask(aura::Window* window, gfx::Path* mask) const = 0; - - // aura::WindowTargeter: - virtual bool EventLocationInsideBounds( - aura::Window* window, - const ui::LocatedEvent& event) const OVERRIDE; - - private: - aura::Window* masked_window_; - - DISALLOW_COPY_AND_ASSIGN(MaskedWindowTargeter); -}; - -} // namespace wm - -#endif // UI_WM_PUBLIC_MASKED_WINDOW_TARGETER_H_ -- cgit v1.1