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

Unified Diff: ash/system/tray_accessibility.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/tray/tray_image_item.cc ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray_accessibility.h
diff --git a/ash/system/tray_accessibility.h b/ash/system/tray_accessibility.h
index c282ba19149e5209c463462be6a851c8070617c0..ccc7b89954af0d3895cd3650d92d710723b7f4e7 100644
--- a/ash/system/tray_accessibility.h
+++ b/ash/system/tray_accessibility.h
@@ -63,8 +63,7 @@ class AccessibilityDetailedView : public TrayDetailsView,
public views::ButtonListener,
public ShellObserver {
public:
- explicit AccessibilityDetailedView(SystemTrayItem* owner,
- user::LoginStatus login);
+ AccessibilityDetailedView(SystemTrayItem* owner, LoginStatus login);
~AccessibilityDetailedView() override {}
private:
@@ -97,7 +96,7 @@ class AccessibilityDetailedView : public TrayDetailsView,
bool large_cursor_enabled_;
bool autoclick_enabled_;
bool virtual_keyboard_enabled_;
- user::LoginStatus login_;
+ LoginStatus login_;
friend class chromeos::TrayAccessibilityTest;
DISALLOW_COPY_AND_ASSIGN(AccessibilityDetailedView);
@@ -117,11 +116,11 @@ class TrayAccessibility : public TrayImageItem,
// Overridden from TrayImageItem.
bool GetInitialVisibility() override;
- views::View* CreateDefaultView(user::LoginStatus status) override;
- views::View* CreateDetailedView(user::LoginStatus status) override;
+ views::View* CreateDefaultView(LoginStatus status) override;
+ views::View* CreateDetailedView(LoginStatus status) override;
void DestroyDefaultView() override;
void DestroyDetailedView() override;
- void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
+ void UpdateAfterLoginStatusChange(LoginStatus status) override;
// Overridden from AccessibilityObserver.
void OnAccessibilityModeChanged(
@@ -136,7 +135,7 @@ class TrayAccessibility : public TrayImageItem,
uint32_t request_popup_view_state_;
bool tray_icon_visible_;
- user::LoginStatus login_;
+ LoginStatus login_;
// Bitmap of values from AccessibilityState enum.
uint32_t previous_accessibility_state_;
« no previous file with comments | « ash/system/tray/tray_image_item.cc ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698