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

Unified Diff: ash/wm/window_resizer.cc

Issue 9565004: Revert 124385 - 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: 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.cc ('k') | ash/wm/window_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_resizer.cc
===================================================================
--- ash/wm/window_resizer.cc (revision 124386)
+++ ash/wm/window_resizer.cc (working copy)
@@ -106,6 +106,13 @@
return result;
}
+bool IsNormalWindow(aura::Window* window) {
+ return window->GetProperty(aura::client::kShowStateKey) ==
+ ui::SHOW_STATE_NORMAL ||
+ window->GetProperty(aura::client::kShowStateKey) ==
+ ui::SHOW_STATE_DEFAULT;
+}
+
} // namespace
// static
@@ -135,7 +142,8 @@
GetPositionChangeDirectionForWindowComponent(window_component_)),
size_change_direction_(
GetSizeChangeDirectionForWindowComponent(window_component_)),
- is_resizable_(bounds_change_ != kBoundsChangeDirection_None),
+ is_resizable_(bounds_change_ != kBoundsChangeDirection_None &&
+ IsNormalWindow(window)),
grid_size_(grid_size),
did_move_or_resize_(false),
root_filter_(NULL) {
« no previous file with comments | « ash/wm/toplevel_window_event_filter.cc ('k') | ash/wm/window_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698