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

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

Issue 10883069: Added restore functionality for maximize full/left/right (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unit test failure Created 8 years, 4 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/maximize_bubble_frame_state.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_layout_manager2.cc
diff --git a/ash/wm/workspace/workspace_layout_manager2.cc b/ash/wm/workspace/workspace_layout_manager2.cc
index 3352e30f0f24e421d1380a3bd69a1d73855369f0..8fb1fa78d0be6f9a18fdddc52becf8a95b4e7457 100644
--- a/ash/wm/workspace/workspace_layout_manager2.cc
+++ b/ash/wm/workspace/workspace_layout_manager2.cc
@@ -136,6 +136,7 @@ void WorkspaceLayoutManager2::OnWindowPropertyChanged(Window* window,
window->layer()->SetTransform(ui::Transform());
}
if (old_state != ui::SHOW_STATE_MINIMIZED &&
+ GetRestoreBoundsInScreen(window) == NULL &&
WorkspaceManager2::IsMaximizedState(new_state) &&
!WorkspaceManager2::IsMaximizedState(old_state)) {
SetRestoreBoundsInParent(window, window->bounds());
« no previous file with comments | « ash/wm/workspace/maximize_bubble_frame_state.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698