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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: trunk/src/ash/wm/workspace/workspace_layout_manager.cc
===================================================================
--- trunk/src/ash/wm/workspace/workspace_layout_manager.cc (revision 194588)
+++ trunk/src/ash/wm/workspace/workspace_layout_manager.cc (working copy)
@@ -6,7 +6,6 @@
#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"
@@ -289,7 +288,7 @@
// 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()->session_state_delegate()->IsScreenLocked())
+ Shell::GetInstance()->IsScreenLocked())
return;
work_area_ = ScreenAsh::GetDisplayWorkAreaBoundsInParent(
workspace_->window()->parent());
« 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