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

Unified Diff: ash/test/status_area_widget_test_helper.cc

Issue 2864663002: cros: Merge SystemTrayDelegate::GetUserLoginStatus (Closed)
Patch Set: update PaletteTray to exclude ARC kiosk Created 3 years, 7 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/system/tray_accessibility.cc ('k') | ash/test/test_system_tray_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/status_area_widget_test_helper.cc
diff --git a/ash/test/status_area_widget_test_helper.cc b/ash/test/status_area_widget_test_helper.cc
index 5b7e496cc5452d86bc7913eb479c0e607edd03b5..134473e13e91f2812024282e6052e258d95eb37c 100644
--- a/ash/test/status_area_widget_test_helper.cc
+++ b/ash/test/status_area_widget_test_helper.cc
@@ -5,14 +5,14 @@
#include "ash/test/status_area_widget_test_helper.h"
#include "ash/root_window_controller.h"
+#include "ash/session/session_controller.h"
#include "ash/shell.h"
#include "ash/system/status_area_widget.h"
-#include "ash/system/tray/system_tray_delegate.h"
namespace ash {
LoginStatus StatusAreaWidgetTestHelper::GetUserLoginStatus() {
- return Shell::Get()->system_tray_delegate()->GetUserLoginStatus();
+ return Shell::Get()->session_controller()->login_status();
}
StatusAreaWidget* StatusAreaWidgetTestHelper::GetStatusAreaWidget() {
« no previous file with comments | « ash/system/tray_accessibility.cc ('k') | ash/test/test_system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698