| Index: ash/system/user/tray_user.h
|
| diff --git a/ash/system/user/tray_user.h b/ash/system/user/tray_user.h
|
| index a0a6b498d077a211292e014cfa425bbb8bcc0aea..bca62ed35f213fef37c13bc5c5aeb9d49f6b40c5 100644
|
| --- a/ash/system/user/tray_user.h
|
| +++ b/ash/system/user/tray_user.h
|
| @@ -57,25 +57,25 @@ class ASH_EXPORT TrayUser : public SystemTrayItem,
|
| gfx::Rect GetUserPanelBoundsInScreenForTest() const;
|
|
|
| // Update the TrayUser as if the current LoginStatus is |status|.
|
| - void UpdateAfterLoginStatusChangeForTest(user::LoginStatus status);
|
| + void UpdateAfterLoginStatusChangeForTest(LoginStatus status);
|
|
|
| // Use for access inside of tests.
|
| tray::UserView* user_view_for_test() const { return user_; }
|
|
|
| private:
|
| // Overridden from SystemTrayItem.
|
| - views::View* CreateTrayView(user::LoginStatus status) override;
|
| - views::View* CreateDefaultView(user::LoginStatus status) override;
|
| + views::View* CreateTrayView(LoginStatus status) override;
|
| + views::View* CreateDefaultView(LoginStatus status) override;
|
| void DestroyTrayView() override;
|
| void DestroyDefaultView() override;
|
| - void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
|
| + void UpdateAfterLoginStatusChange(LoginStatus status) override;
|
| void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
|
|
|
| // Overridden from UserObserver.
|
| void OnUserUpdate() override;
|
| void OnUserAddedToSession() override;
|
|
|
| - void UpdateAvatarImage(user::LoginStatus status);
|
| + void UpdateAvatarImage(LoginStatus status);
|
|
|
| // Updates the layout of this item.
|
| void UpdateLayoutOfItem();
|
|
|