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

Unified Diff: ash/wm/workspace/workspace_manager.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/workspace/workspace_manager.h ('k') | ash/wm/workspace/workspace_window_resizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_manager.cc
===================================================================
--- ash/wm/workspace/workspace_manager.cc (revision 124386)
+++ ash/wm/workspace/workspace_manager.cc (working copy)
@@ -88,7 +88,7 @@
bool WorkspaceManager::IsManagedWindow(aura::Window* window) const {
return window->type() == aura::client::WINDOW_TYPE_NORMAL &&
- !window->transient_parent() && ash::GetTrackedByWorkspace(window);
+ !window->transient_parent();
}
void WorkspaceManager::AddWindow(aura::Window* window) {
@@ -186,9 +186,12 @@
void WorkspaceManager::OnWindowPropertyChanged(aura::Window* window,
const void* key,
intptr_t old) {
- if (key != aura::client::kShowStateKey || !IsManagedWindow(window))
+ if (!IsManagedWindow(window))
return;
+ if (key != aura::client::kShowStateKey)
+ return;
+
DCHECK(FindBy(window));
Workspace::Type old_type = FindBy(window)->type();
« no previous file with comments | « ash/wm/workspace/workspace_manager.h ('k') | ash/wm/workspace/workspace_window_resizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698