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

Unified Diff: ash/wm/toplevel_window_event_filter.cc

Issue 9467021: Attempt 3: Makes managed mode constrain the height of windows so they don't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Da fix Created 8 years, 10 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 | « ash/wm/toplevel_window_event_filter.h ('k') | ash/wm/toplevel_window_event_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/toplevel_window_event_filter.cc
diff --git a/ash/wm/toplevel_window_event_filter.cc b/ash/wm/toplevel_window_event_filter.cc
index 20ae5e5ed135d994165b976d309d05c55ca3f498..78645fefc7b98f769c6a14ea3a656692d0357c41 100644
--- a/ash/wm/toplevel_window_event_filter.cc
+++ b/ash/wm/toplevel_window_event_filter.cc
@@ -48,8 +48,7 @@ bool ToplevelWindowEventFilter::PreHandleMouseEvent(aura::Window* target,
target->delegate()->GetNonClientComponent(event->location());
if (WindowResizer::GetBoundsChangeForWindowComponent(component)) {
window_resizer_.reset(
- new WindowResizer(target, event->location(), component,
- grid_size_));
+ CreateWindowResizer(target, event->location(), component));
if (!window_resizer_->is_resizable())
window_resizer_.reset();
} else {
@@ -93,7 +92,7 @@ ui::GestureStatus ToplevelWindowEventFilter::PreHandleGestureEvent(
}
in_gesture_resize_ = true;
window_resizer_.reset(
- new WindowResizer(target, event->location(), component, grid_size_));
+ CreateWindowResizer(target, event->location(), component));
if (!window_resizer_->is_resizable())
window_resizer_.reset();
break;
@@ -125,7 +124,7 @@ void ToplevelWindowEventFilter::RunMoveLoop(aura::Window* source) {
aura::Window::ConvertPointToWindow(
Shell::GetRootWindow(), source, &source_mouse_location);
window_resizer_.reset(
- new WindowResizer(source, source_mouse_location, HTCAPTION, grid_size_));
+ CreateWindowResizer(source, source_mouse_location, HTCAPTION));
#if !defined(OS_MACOSX)
MessageLoopForUI::current()->RunWithDispatcher(
aura::Env::GetInstance()->GetDispatcher());
@@ -143,6 +142,13 @@ void ToplevelWindowEventFilter::EndMoveLoop() {
Shell::GetRootWindow()->PostNativeEvent(ui::CreateNoopEvent());
}
+WindowResizer* ToplevelWindowEventFilter::CreateWindowResizer(
+ aura::Window* window,
+ const gfx::Point& point,
+ int window_component) {
+ return new WindowResizer(window, point, window_component, grid_size_);
+}
+
void ToplevelWindowEventFilter::CompleteDrag(aura::Window* window) {
scoped_ptr<WindowResizer> resizer(window_resizer_.release());
if (resizer.get())
« no previous file with comments | « ash/wm/toplevel_window_event_filter.h ('k') | ash/wm/toplevel_window_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698