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

Unified Diff: ash/wm/workspace_controller.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/workspace/workspace_window_resizer.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace_controller.cc
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 77868fc0dfb61c06f9755314ddf15e48e88183f3..f23fcc9d999ab90d706b9e3cf75a48d9f44e104a 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -45,6 +45,9 @@ WorkspaceController::WorkspaceController(aura::Window* viewport)
WorkspaceController::~WorkspaceController() {
Shell::GetRootWindow()->RemoveObserver(this);
Shell::GetRootWindow()->RemoveRootWindowObserver(this);
+ // WorkspaceLayoutManager may attempt to access state from us. Destroy it now.
+ if (viewport_->layout_manager() == layout_manager_)
+ viewport_->SetLayoutManager(NULL);
}
void WorkspaceController::ToggleOverview() {
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698