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

Side by Side Diff: trunk/src/ash/wm/workspace/workspace_layout_manager.cc

Issue 14200034: Revert 194578 "Add ash SessionStateDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/workspace/workspace_layout_manager.h" 5 #include "ash/wm/workspace/workspace_layout_manager.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/screen_ash.h" 8 #include "ash/screen_ash.h"
9 #include "ash/session_state_delegate.h"
10 #include "ash/shell.h" 9 #include "ash/shell.h"
11 #include "ash/wm/always_on_top_controller.h" 10 #include "ash/wm/always_on_top_controller.h"
12 #include "ash/wm/base_layout_manager.h" 11 #include "ash/wm/base_layout_manager.h"
13 #include "ash/wm/window_animations.h" 12 #include "ash/wm/window_animations.h"
14 #include "ash/wm/window_properties.h" 13 #include "ash/wm/window_properties.h"
15 #include "ash/wm/window_util.h" 14 #include "ash/wm/window_util.h"
16 #include "ash/wm/workspace/workspace.h" 15 #include "ash/wm/workspace/workspace.h"
17 #include "ash/wm/workspace/workspace_manager.h" 16 #include "ash/wm/workspace/workspace_manager.h"
18 #include "ash/wm/workspace/workspace_window_resizer.h" 17 #include "ash/wm/workspace/workspace_window_resizer.h"
19 #include "base/auto_reset.h" 18 #include "base/auto_reset.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 workspace_, window, last_show_state, cloned_layer); 281 workspace_, window, last_show_state, cloned_layer);
283 } 282 }
284 } 283 }
285 284
286 void WorkspaceLayoutManager::AdjustWindowSizesForScreenChange( 285 void WorkspaceLayoutManager::AdjustWindowSizesForScreenChange(
287 AdjustWindowReason reason) { 286 AdjustWindowReason reason) {
288 // Don't do any adjustments of the insets while we are in screen locked mode. 287 // Don't do any adjustments of the insets while we are in screen locked mode.
289 // This would happen if the launcher was auto hidden before the login screen 288 // This would happen if the launcher was auto hidden before the login screen
290 // was shown and then gets shown when the login screen gets presented. 289 // was shown and then gets shown when the login screen gets presented.
291 if (reason == ADJUST_WINDOW_DISPLAY_INSETS_CHANGED && 290 if (reason == ADJUST_WINDOW_DISPLAY_INSETS_CHANGED &&
292 Shell::GetInstance()->session_state_delegate()->IsScreenLocked()) 291 Shell::GetInstance()->IsScreenLocked())
293 return; 292 return;
294 work_area_ = ScreenAsh::GetDisplayWorkAreaBoundsInParent( 293 work_area_ = ScreenAsh::GetDisplayWorkAreaBoundsInParent(
295 workspace_->window()->parent()); 294 workspace_->window()->parent());
296 // If a user plugs an external display into a laptop running Aura the 295 // If a user plugs an external display into a laptop running Aura the
297 // display size will change. Maximized windows need to resize to match. 296 // display size will change. Maximized windows need to resize to match.
298 // We also do this when developers running Aura on a desktop manually resize 297 // We also do this when developers running Aura on a desktop manually resize
299 // the host window. 298 // the host window.
300 // We also need to do this when the work area insets changes. 299 // We also need to do this when the work area insets changes.
301 for (WindowSet::const_iterator it = windows_.begin(); 300 for (WindowSet::const_iterator it = windows_.begin();
302 it != windows_.end(); 301 it != windows_.end();
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 } 385 }
387 return false; 386 return false;
388 } 387 }
389 388
390 WorkspaceManager* WorkspaceLayoutManager::workspace_manager() { 389 WorkspaceManager* WorkspaceLayoutManager::workspace_manager() {
391 return workspace_->workspace_manager(); 390 return workspace_->workspace_manager();
392 } 391 }
393 392
394 } // namespace internal 393 } // namespace internal
395 } // namespace ash 394 } // namespace ash
OLDNEW
« no previous file with comments | « trunk/src/ash/wm/workspace/workspace_cycler.cc ('k') | trunk/src/chrome/browser/chromeos/dbus/printer_service_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698