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

Unified Diff: ash/wm/toplevel_window_event_filter.cc

Issue 9566014: Attempt 2: Allows tab dragging when maximized on aura. To fix it I made it so (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/property_util.cc ('k') | ash/wm/window_resizer.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 e63575f73b62fccaba56be94aa6e75e1208099e1..478de257eee1537caf16a72255da3d8e7fd9ecc5 100644
--- a/ash/wm/toplevel_window_event_filter.cc
+++ b/ash/wm/toplevel_window_event_filter.cc
@@ -53,7 +53,7 @@ bool ToplevelWindowEventFilter::PreHandleMouseEvent(aura::Window* target,
if (WindowResizer::GetBoundsChangeForWindowComponent(component)) {
window_resizer_.reset(
CreateWindowResizer(target, event->location(), component));
- if (!window_resizer_->is_resizable())
+ if (window_resizer_.get() && !window_resizer_->is_resizable())
window_resizer_.reset();
} else {
window_resizer_.reset();
@@ -107,7 +107,7 @@ ui::GestureStatus ToplevelWindowEventFilter::PreHandleGestureEvent(
in_gesture_resize_ = true;
window_resizer_.reset(
CreateWindowResizer(target, event->location(), component));
- if (!window_resizer_->is_resizable())
+ if (window_resizer_.get() && !window_resizer_->is_resizable())
window_resizer_.reset();
break;
}
@@ -163,6 +163,8 @@ WindowResizer* ToplevelWindowEventFilter::CreateWindowResizer(
aura::Window* window,
const gfx::Point& point,
int window_component) {
+ if (!wm::IsWindowNormal(window))
+ return NULL; // Don't allow resizing/dragging maximized/fullscreen windows.
return new WindowResizer(window, point, window_component, grid_size_);
}
« no previous file with comments | « ash/wm/property_util.cc ('k') | ash/wm/window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698