| Index: ash/system/user/user_view.cc
|
| diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc
|
| index 408a86d0b98b0c0f9c6b07e959afae68f88d9dea..03b7b54a502ff3a728c135e0baf6e3f03a5b2177 100644
|
| --- a/ash/system/user/user_view.cc
|
| +++ b/ash/system/user/user_view.cc
|
| @@ -96,7 +96,7 @@ class LogoutButton : public TrayPopupLabelButton {
|
|
|
| private:
|
| virtual void Paint(gfx::Canvas* canvas,
|
| - const views::CullSet& cull_set) OVERRIDE {
|
| + const views::CullSet& cull_set) override {
|
| // Just skip paint if this button used as a placeholder.
|
| if (!placeholder_)
|
| TrayPopupLabelButton::Paint(canvas, cull_set);
|
| @@ -114,7 +114,7 @@ class UserViewMouseWatcherHost : public views::MouseWatcherHost {
|
|
|
| // Implementation of MouseWatcherHost.
|
| virtual bool Contains(const gfx::Point& screen_point,
|
| - views::MouseWatcherHost::MouseEventType type) OVERRIDE {
|
| + views::MouseWatcherHost::MouseEventType type) override {
|
| return screen_area_.Contains(screen_point);
|
| }
|
|
|
| @@ -137,7 +137,7 @@ class AddUserView : public views::View {
|
|
|
| private:
|
| // Overridden from views::View.
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const override;
|
|
|
| // Create the additional client content for this item.
|
| void AddContent();
|
|
|