| Index: chrome/browser/ui/views/profiles/avatar_menu_bubble_view.cc
|
| diff --git a/chrome/browser/ui/views/profiles/avatar_menu_bubble_view.cc b/chrome/browser/ui/views/profiles/avatar_menu_bubble_view.cc
|
| index 7888af8daf29085096f27f100ec889116b9f7895..e2a4acca18ee706060b2bdfcf45701e6679f550d 100644
|
| --- a/chrome/browser/ui/views/profiles/avatar_menu_bubble_view.cc
|
| +++ b/chrome/browser/ui/views/profiles/avatar_menu_bubble_view.cc
|
| @@ -88,7 +88,7 @@ class BadgeImageSource: public gfx::CanvasImageSource {
|
| virtual ~BadgeImageSource();
|
|
|
| // Overridden from CanvasImageSource:
|
| - virtual void Draw(gfx::Canvas* canvas) OVERRIDE;
|
| + virtual void Draw(gfx::Canvas* canvas) override;
|
|
|
| private:
|
| gfx::Size ComputeSize(const gfx::ImageSkia& icon,
|
| @@ -152,10 +152,10 @@ class EditProfileLink : public views::Link {
|
| explicit EditProfileLink(const base::string16& title,
|
| HighlightDelegate* delegate);
|
|
|
| - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void OnFocus() OVERRIDE;
|
| - virtual void OnBlur() OVERRIDE;
|
| + virtual void OnMouseEntered(const ui::MouseEvent& event) override;
|
| + virtual void OnMouseExited(const ui::MouseEvent& event) override;
|
| + virtual void OnFocus() override;
|
| + virtual void OnBlur() override;
|
|
|
| views::CustomButton::ButtonState state() { return state_; }
|
|
|
| @@ -207,15 +207,15 @@ class ProfileItemView : public views::CustomButton,
|
| AvatarMenuBubbleView* parent,
|
| AvatarMenu* menu);
|
|
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| - virtual void Layout() OVERRIDE;
|
| - virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
|
| - virtual void OnFocus() OVERRIDE;
|
| - virtual void OnBlur() OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const override;
|
| + virtual void Layout() override;
|
| + virtual void OnMouseEntered(const ui::MouseEvent& event) override;
|
| + virtual void OnMouseExited(const ui::MouseEvent& event) override;
|
| + virtual void OnFocus() override;
|
| + virtual void OnBlur() override;
|
|
|
| - virtual void OnHighlightStateChanged() OVERRIDE;
|
| - virtual void OnFocusStateChanged(bool has_focus) OVERRIDE;
|
| + virtual void OnHighlightStateChanged() override;
|
| + virtual void OnFocusStateChanged(bool has_focus) override;
|
|
|
| const AvatarMenu::Item& item() const { return item_; }
|
| EditProfileLink* edit_link() { return edit_link_; }
|
|
|