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

Unified Diff: ash/wm/toplevel_window_event_handler.cc

Issue 11574041: Move WindowResizer to CoreWM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 | « ash/wm/property_util.cc ('k') | ash/wm/window_resizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/toplevel_window_event_handler.cc
===================================================================
--- ash/wm/toplevel_window_event_handler.cc (revision 173169)
+++ ash/wm/toplevel_window_event_handler.cc (working copy)
@@ -7,7 +7,7 @@
#include "ash/shell.h"
#include "ash/wm/property_util.h"
#include "ash/wm/resize_shadow_controller.h"
-#include "ash/wm/window_resizer.h"
+#include "ash/wm/window_resizer_factory.h"
#include "ash/wm/window_util.h"
#include "ash/wm/workspace/snap_sizer.h"
#include "base/message_loop.h"
@@ -28,6 +28,7 @@
#include "ui/compositor/layer.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/gfx/screen.h"
+#include "ui/views/corewm/window_resizer.h"
namespace {
const double kMinHorizVelocityForWindowSwipe = 1100;
@@ -56,10 +57,10 @@
: public aura::WindowObserver {
public:
ScopedWindowResizer(ToplevelWindowEventHandler* handler,
- WindowResizer* resizer);
+ views::corewm::WindowResizer* resizer);
virtual ~ScopedWindowResizer();
- WindowResizer* resizer() { return resizer_.get(); }
+ views::corewm::WindowResizer* resizer() { return resizer_.get(); }
// WindowObserver overrides:
virtual void OnWindowPropertyChanged(aura::Window* window,
@@ -69,14 +70,14 @@
private:
ToplevelWindowEventHandler* handler_;
- scoped_ptr<WindowResizer> resizer_;
+ scoped_ptr<views::corewm::WindowResizer> resizer_;
DISALLOW_COPY_AND_ASSIGN(ScopedWindowResizer);
};
ToplevelWindowEventHandler::ScopedWindowResizer::ScopedWindowResizer(
ToplevelWindowEventHandler* handler,
- WindowResizer* resizer)
+ views::corewm::WindowResizer* resizer)
: handler_(handler),
resizer_(resizer) {
if (resizer_.get())
@@ -165,7 +166,8 @@
case ui::ET_GESTURE_SCROLL_BEGIN: {
int component =
target->delegate()->GetNonClientComponent(event->location());
- if (WindowResizer::GetBoundsChangeForWindowComponent(component) == 0) {
+ if (views::corewm::WindowResizer::GetBoundsChangeForWindowComponent(
+ component) == 0) {
window_resizer_.reset();
return;
}
@@ -201,8 +203,10 @@
int component =
target->delegate()->GetNonClientComponent(event->location());
- if (WindowResizer::GetBoundsChangeForWindowComponent(component) == 0)
+ if (views::corewm::WindowResizer::GetBoundsChangeForWindowComponent(
+ component) == 0) {
return;
+ }
if (!wm::IsWindowNormal(target))
return;
@@ -305,7 +309,7 @@
const gfx::Point& point_in_parent,
int window_component) {
window_resizer_.reset();
- WindowResizer* resizer =
+ views::corewm::WindowResizer* resizer =
CreateWindowResizer(window, point_in_parent, window_component).release();
if (resizer)
window_resizer_.reset(new ScopedWindowResizer(this, resizer));
@@ -337,15 +341,16 @@
target->delegate()->GetNonClientComponent(event->location());
if ((event->flags() &
(ui::EF_IS_DOUBLE_CLICK | ui::EF_IS_TRIPLE_CLICK)) == 0 &&
- WindowResizer::GetBoundsChangeForWindowComponent(component)) {
+ views::corewm::WindowResizer::GetBoundsChangeForWindowComponent(
+ component)) {
gfx::Point location_in_parent(
ConvertPointToParent(target, event->location()));
CreateScopedWindowResizer(target, location_in_parent, component);
} else {
window_resizer_.reset();
}
- return WindowResizer::GetBoundsChangeForWindowComponent(component) != 0 ?
- ui::ER_CONSUMED : ui::ER_UNHANDLED;
+ return views::corewm::WindowResizer::GetBoundsChangeForWindowComponent(
+ component) != 0 ? ui::ER_CONSUMED : ui::ER_UNHANDLED;
}
ui::EventResult ToplevelWindowEventHandler::HandleMouseReleased(
« no previous file with comments | « ash/wm/property_util.cc ('k') | ash/wm/window_resizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698