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

Unified Diff: ash/wm/workspace/workspace_manager.cc

Issue 9549009: 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 windows 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
diff --git a/ash/wm/workspace/workspace_manager.cc b/ash/wm/workspace/workspace_manager.cc
index 098c4e91a52de89c20abc818d9360a171af33f14..d8f40870fb03084a08fba841acd3be26cc6b1e86 100644
--- a/ash/wm/workspace/workspace_manager.cc
+++ b/ash/wm/workspace/workspace_manager.cc
@@ -92,7 +92,7 @@ WorkspaceManager::~WorkspaceManager() {
bool WorkspaceManager::IsManagedWindow(aura::Window* window) const {
return window->type() == aura::client::WINDOW_TYPE_NORMAL &&
- !window->transient_parent();
+ !window->transient_parent() && ash::GetTrackedByWorkspace(window);
}
bool WorkspaceManager::ShouldMaximize(aura::Window* window) const {
@@ -202,10 +202,7 @@ gfx::Rect WorkspaceManager::AlignBoundsToGrid(const gfx::Rect& bounds) {
void WorkspaceManager::OnWindowPropertyChanged(aura::Window* window,
const void* key,
intptr_t old) {
- if (!IsManagedWindow(window))
- return;
-
- if (key != aura::client::kShowStateKey)
+ if (key != aura::client::kShowStateKey || !IsManagedWindow(window))
return;
DCHECK(FindBy(window));
« 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