| Index: ash/system/user/user_view.h
|
| diff --git a/ash/system/user/user_view.h b/ash/system/user/user_view.h
|
| index 750b8f373316a44120fb8535202573b37c0351d5..29be0bdca229b6c0040cdad4bb0f12ebdf0bcd19 100644
|
| --- a/ash/system/user/user_view.h
|
| +++ b/ash/system/user/user_view.h
|
| @@ -42,29 +42,26 @@ class UserView : public views::View,
|
| ash::user::LoginStatus login,
|
| MultiProfileIndex index,
|
| bool for_detailed_view);
|
| - virtual ~UserView();
|
| + ~UserView() override;
|
|
|
| // Overridden from MouseWatcherListener:
|
| - virtual void MouseMovedOutOfHost() override;
|
| + void MouseMovedOutOfHost() override;
|
|
|
| TrayUser::TestState GetStateForTest() const;
|
| gfx::Rect GetBoundsInScreenOfUserButtonForTest();
|
|
|
| private:
|
| // Overridden from views::View.
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual int GetHeightForWidth(int width) const override;
|
| - virtual void Layout() override;
|
| + gfx::Size GetPreferredSize() const override;
|
| + int GetHeightForWidth(int width) const override;
|
| + void Layout() override;
|
|
|
| // Overridden from views::ButtonListener.
|
| - virtual void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) override;
|
| + void ButtonPressed(views::Button* sender, const ui::Event& event) override;
|
|
|
| // Overridden from views::FocusChangeListener:
|
| - virtual void OnWillChangeFocus(View* focused_before,
|
| - View* focused_now) override;
|
| - virtual void OnDidChangeFocus(View* focused_before,
|
| - View* focused_now) override;
|
| + void OnWillChangeFocus(View* focused_before, View* focused_now) override;
|
| + void OnDidChangeFocus(View* focused_before, View* focused_now) override;
|
|
|
| void AddLogoutButton(user::LoginStatus login);
|
| void AddUserCard(user::LoginStatus login);
|
|
|