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

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

Issue 14295008: Add ash SessionStateDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/workspace/workspace_cycler.cc ('k') | chrome/browser/chromeos/dbus/printer_service_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_layout_manager.cc
diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc
index 1b052d2430df4fbfd2323fab58fe8f8d2dd974be..1d4dc622f4748ff4cd10711c9e3567cfaf1f1c59 100644
--- a/ash/wm/workspace/workspace_layout_manager.cc
+++ b/ash/wm/workspace/workspace_layout_manager.cc
@@ -6,6 +6,7 @@
#include "ash/ash_switches.h"
#include "ash/screen_ash.h"
+#include "ash/session_state_delegate.h"
#include "ash/shell.h"
#include "ash/wm/always_on_top_controller.h"
#include "ash/wm/base_layout_manager.h"
@@ -288,7 +289,7 @@ void WorkspaceLayoutManager::AdjustWindowSizesForScreenChange(
// This would happen if the launcher was auto hidden before the login screen
// was shown and then gets shown when the login screen gets presented.
if (reason == ADJUST_WINDOW_DISPLAY_INSETS_CHANGED &&
- Shell::GetInstance()->IsScreenLocked())
+ Shell::GetInstance()->session_state_delegate()->IsScreenLocked())
return;
work_area_ = ScreenAsh::GetDisplayWorkAreaBoundsInParent(
workspace_->window()->parent());
« no previous file with comments | « ash/wm/workspace/workspace_cycler.cc ('k') | chrome/browser/chromeos/dbus/printer_service_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698