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

Unified Diff: ash/wm/workspace/workspace_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/window_util.cc ('k') | ash/wm/workspace/workspace_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_event_filter.cc
diff --git a/ash/wm/workspace/workspace_event_filter.cc b/ash/wm/workspace/workspace_event_filter.cc
index 456691183b4bc672fd599a900e4fa2396d5a28d3..effdc2fffa9b334cbb5d02b918cb7477693b4d38 100644
--- a/ash/wm/workspace/workspace_event_filter.cc
+++ b/ash/wm/workspace/workspace_event_filter.cc
@@ -4,6 +4,7 @@
#include "ash/wm/workspace/workspace_event_filter.h"
+#include "ash/wm/property_util.h"
#include "ash/wm/window_frame.h"
#include "ash/wm/window_util.h"
#include "ash/wm/workspace/workspace_layout_manager.h"
@@ -66,6 +67,12 @@ WindowResizer* WorkspaceEventFilter::CreateWindowResizer(
aura::Window* window,
const gfx::Point& point,
int window_component) {
+ // Allow dragging maximized windows if it's not tracked by workspace. This is
+ // set by tab dragging code.
+ if (!wm::IsWindowNormal(window) &&
+ (window_component != HTCAPTION || GetTrackedByWorkspace(window))) {
+ return NULL;
+ }
return
new WorkspaceWindowResizer(window, point, window_component, grid_size());
}
« no previous file with comments | « ash/wm/window_util.cc ('k') | ash/wm/workspace/workspace_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698