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

Unified Diff: ash/common/test/test_system_tray_delegate.cc

Issue 2761373002: Move yet more from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 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/common/test/test_shelf_delegate.cc ('k') | ash/common/wallpaper/wallpaper_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/test/test_system_tray_delegate.cc
diff --git a/ash/common/test/test_system_tray_delegate.cc b/ash/common/test/test_system_tray_delegate.cc
index c6d3226f0bf3356f50f97a6c4a7227b8ee8bf053..24aefa48c55af67a32eb6c0984689a5754191a8e 100644
--- a/ash/common/test/test_system_tray_delegate.cc
+++ b/ash/common/test/test_system_tray_delegate.cc
@@ -9,6 +9,7 @@
#include "ash/common/login_status.h"
#include "ash/common/session/session_controller.h"
#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
#include "base/time/time.h"
namespace ash {
@@ -27,7 +28,7 @@ TestSystemTrayDelegate::~TestSystemTrayDelegate() {}
void TestSystemTrayDelegate::SetLoginStatus(LoginStatus login_status) {
login_status_ = login_status;
- WmShell::Get()->UpdateAfterLoginStatusChange(login_status);
+ Shell::Get()->UpdateAfterLoginStatusChange(login_status);
}
void TestSystemTrayDelegate::SetSessionLengthLimitForTest(
@@ -57,7 +58,7 @@ 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().
- SessionController* controller = WmShell::Get()->session_controller();
+ SessionController* controller = Shell::Get()->session_controller();
if (!controller->IsActiveUserSessionStarted())
return LoginStatus::NOT_LOGGED_IN;
« no previous file with comments | « ash/common/test/test_shelf_delegate.cc ('k') | ash/common/wallpaper/wallpaper_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698