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

Unified Diff: ash/system/date/tray_date.h

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 6 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/date/date_default_view.cc ('k') | ash/system/date/tray_date.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/date/tray_date.h
diff --git a/ash/system/date/tray_date.h b/ash/system/date/tray_date.h
index f3bf4b44a66433a8a3666ae73686c029deae75ce..9a8c00529f35a2e85af8800780d14576adb9abb2 100644
--- a/ash/system/date/tray_date.h
+++ b/ash/system/date/tray_date.h
@@ -47,17 +47,17 @@ class ASH_EXPORT TrayDate : public SystemTrayItem, public ClockObserver {
const tray::TimeView* GetTimeTrayForTesting() const;
const DateDefaultView* GetDefaultViewForTesting() const;
- views::View* CreateDefaultViewForTesting(user::LoginStatus status);
+ views::View* CreateDefaultViewForTesting(LoginStatus status);
private:
// Overridden from SystemTrayItem.
- views::View* CreateTrayView(user::LoginStatus status) override;
- views::View* CreateDefaultView(user::LoginStatus status) override;
- views::View* CreateDetailedView(user::LoginStatus status) override;
+ views::View* CreateTrayView(LoginStatus status) override;
+ views::View* CreateDefaultView(LoginStatus status) override;
+ views::View* CreateDetailedView(LoginStatus status) override;
void DestroyTrayView() override;
void DestroyDefaultView() override;
void DestroyDetailedView() override;
- void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
+ void UpdateAfterLoginStatusChange(LoginStatus status) override;
void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
// Overridden from ClockObserver.
@@ -70,7 +70,7 @@ class ASH_EXPORT TrayDate : public SystemTrayItem, public ClockObserver {
tray::TimeView* time_tray_;
DateDefaultView* default_view_;
- user::LoginStatus login_status_;
+ LoginStatus login_status_;
#if defined(OS_CHROMEOS)
std::unique_ptr<SystemClockObserver> system_clock_observer_;
« no previous file with comments | « ash/system/date/date_default_view.cc ('k') | ash/system/date/tray_date.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698