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

Unified Diff: trunk/src/ash/system/tray/test_system_tray_delegate.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
« no previous file with comments | « trunk/src/ash/system/date/tray_date.cc ('k') | trunk/src/ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/system/tray/test_system_tray_delegate.cc
===================================================================
--- trunk/src/ash/system/tray/test_system_tray_delegate.cc (revision 194588)
+++ trunk/src/ash/system/tray/test_system_tray_delegate.cc (working copy)
@@ -6,8 +6,8 @@
#include <string>
-#include "ash/session_state_delegate.h"
#include "ash/shell.h"
+#include "ash/shell_delegate.h"
#include "ash/volume_control_delegate.h"
#include "base/utf_string_conversions.h"
#include "base/message_loop.h"
@@ -90,12 +90,9 @@
user::LoginStatus TestSystemTrayDelegate::GetUserLoginStatus() const {
// At new user image screen manager->IsUserLoggedIn() would return true
// but there's no browser session available yet so use SessionStarted().
- SessionStateDelegate* delegate =
- Shell::GetInstance()->session_state_delegate();
-
- if (!delegate->IsActiveUserSessionStarted())
+ if (!Shell::GetInstance()->delegate()->IsSessionStarted())
return ash::user::LOGGED_IN_NONE;
- if (delegate->IsScreenLocked())
+ if (Shell::GetInstance()->IsScreenLocked())
return user::LOGGED_IN_LOCKED;
// TODO(nkostylev): Support LOGGED_IN_OWNER, LOGGED_IN_GUEST, LOGGED_IN_KIOSK,
// LOGGED_IN_PUBLIC.
« no previous file with comments | « trunk/src/ash/system/date/tray_date.cc ('k') | trunk/src/ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698