diff --git a/atom/browser/ui/views/frameless_view.h b/atom/browser/ui/views/frameless_view.h index 18542e8ca466..f07a8c6758e6 100644 --- a/atom/browser/ui/views/frameless_view.h +++ b/atom/browser/ui/views/frameless_view.h @@ -27,21 +27,21 @@ class FramelessView : public views::NonClientFrameView { protected: // views::NonClientFrameView: - virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; - virtual gfx::Rect GetWindowBoundsForClientBounds( - const gfx::Rect& client_bounds) const OVERRIDE; - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; - virtual void GetWindowMask(const gfx::Size& size, - gfx::Path* window_mask) OVERRIDE; - virtual void ResetWindowControls() OVERRIDE; - virtual void UpdateWindowIcon() OVERRIDE; - virtual void UpdateWindowTitle() OVERRIDE; + gfx::Rect GetBoundsForClientView() const override; + gfx::Rect GetWindowBoundsForClientBounds( + const gfx::Rect& client_bounds) const override; + int NonClientHitTest(const gfx::Point& point) override; + void GetWindowMask(const gfx::Size& size, + gfx::Path* window_mask) override; + void ResetWindowControls() override; + void UpdateWindowIcon() override; + void UpdateWindowTitle() override; // Overridden from View: - virtual gfx::Size GetPreferredSize() const OVERRIDE; - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + gfx::Size GetPreferredSize() const override; + gfx::Size GetMinimumSize() const override; + gfx::Size GetMaximumSize() const override; + const char* GetClassName() const override; // Not owned. NativeWindowViews* window_; diff --git a/atom/browser/ui/views/menu_bar.h b/atom/browser/ui/views/menu_bar.h index 56f6e8d338f0..ac82711f8b9a 100644 --- a/atom/browser/ui/views/menu_bar.h +++ b/atom/browser/ui/views/menu_bar.h @@ -51,15 +51,14 @@ class MenuBar : public views::View, protected: // views::View: - virtual const char* GetClassName() const OVERRIDE; + const char* GetClassName() const override; // views::ButtonListener: - virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) OVERRIDE; + void ButtonPressed(views::Button* sender, const ui::Event& event) override; // views::MenuButtonListener: - virtual void OnMenuButtonClicked(views::View* source, - const gfx::Point& point) OVERRIDE; + void OnMenuButtonClicked(views::View* source, + const gfx::Point& point) override; private: SkColor background_color_; diff --git a/atom/browser/ui/views/menu_delegate.h b/atom/browser/ui/views/menu_delegate.h index da0ad3fad8f9..4f84d166db6a 100644 --- a/atom/browser/ui/views/menu_delegate.h +++ b/atom/browser/ui/views/menu_delegate.h @@ -30,25 +30,24 @@ class MenuDelegate : public views::MenuDelegate { protected: // views::MenuDelegate: - virtual void ExecuteCommand(int id) OVERRIDE; - virtual void ExecuteCommand(int id, int mouse_event_flags) OVERRIDE; - virtual bool IsTriggerableEvent(views::MenuItemView* source, - const ui::Event& e) OVERRIDE; - virtual bool GetAccelerator(int id, - ui::Accelerator* accelerator) const OVERRIDE; - virtual base::string16 GetLabel(int id) const OVERRIDE; - virtual const gfx::FontList* GetLabelFontList(int id) const OVERRIDE; - virtual bool IsCommandEnabled(int id) const OVERRIDE; - virtual bool IsItemChecked(int id) const OVERRIDE; - virtual void SelectionChanged(views::MenuItemView* menu) OVERRIDE; - virtual void WillShowMenu(views::MenuItemView* menu) OVERRIDE; - virtual void WillHideMenu(views::MenuItemView* menu) OVERRIDE; - virtual views::MenuItemView* GetSiblingMenu( + void ExecuteCommand(int id) override; + void ExecuteCommand(int id, int mouse_event_flags) override; + bool IsTriggerableEvent(views::MenuItemView* source, + const ui::Event& e) override; + bool GetAccelerator(int id, ui::Accelerator* accelerator) const override; + base::string16 GetLabel(int id) const override; + const gfx::FontList* GetLabelFontList(int id) const override; + bool IsCommandEnabled(int id) const override; + bool IsItemChecked(int id) const override; + void SelectionChanged(views::MenuItemView* menu) override; + void WillShowMenu(views::MenuItemView* menu) override; + void WillHideMenu(views::MenuItemView* menu) override; + views::MenuItemView* GetSiblingMenu( views::MenuItemView* menu, const gfx::Point& screen_point, views::MenuAnchorPosition* anchor, bool* has_mnemonics, - views::MenuButton** button); + views::MenuButton** button) override; private: // Gets the cached menu item view from the model. diff --git a/atom/browser/ui/views/menu_layout.h b/atom/browser/ui/views/menu_layout.h index 7edfe8342cd6..def28214ea99 100644 --- a/atom/browser/ui/views/menu_layout.h +++ b/atom/browser/ui/views/menu_layout.h @@ -15,10 +15,10 @@ class MenuLayout : public views::FillLayout { virtual ~MenuLayout(); // views::LayoutManager: - virtual void Layout(views::View* host) OVERRIDE; - virtual gfx::Size GetPreferredSize(const views::View* host) const OVERRIDE; - virtual int GetPreferredHeightForWidth( - const views::View* host, int width) const OVERRIDE; + void Layout(views::View* host) override; + gfx::Size GetPreferredSize(const views::View* host) const override; + int GetPreferredHeightForWidth( + const views::View* host, int width) const override; private: bool HasMenu(const views::View* host) const; diff --git a/atom/browser/ui/views/submenu_button.h b/atom/browser/ui/views/submenu_button.h index 8edf2fe30473..3f72a60c10b4 100644 --- a/atom/browser/ui/views/submenu_button.h +++ b/atom/browser/ui/views/submenu_button.h @@ -26,7 +26,7 @@ class SubmenuButton : public views::MenuButton { base::char16 accelerator() const { return accelerator_; } // views::MenuButton: - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; + void OnPaint(gfx::Canvas* canvas) override; private: bool GetUnderlinePosition(const base::string16& text, diff --git a/atom/browser/ui/views/win_frame_view.h b/atom/browser/ui/views/win_frame_view.h index 87018fd02d37..43bab2c8f430 100644 --- a/atom/browser/ui/views/win_frame_view.h +++ b/atom/browser/ui/views/win_frame_view.h @@ -15,14 +15,14 @@ class WinFrameView : public FramelessView { virtual ~WinFrameView(); // views::NonClientFrameView: - virtual gfx::Rect GetWindowBoundsForClientBounds( - const gfx::Rect& client_bounds) const OVERRIDE; - virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; + gfx::Rect GetWindowBoundsForClientBounds( + const gfx::Rect& client_bounds) const override; + int NonClientHitTest(const gfx::Point& point) override; // views::View: - virtual gfx::Size GetMinimumSize() const OVERRIDE; - virtual gfx::Size GetMaximumSize() const OVERRIDE; - virtual const char* GetClassName() const OVERRIDE; + gfx::Size GetMinimumSize() const override; + gfx::Size GetMaximumSize() const override; + const char* GetClassName() const override; private: void ClientAreaSizeToWindowSize(gfx::Size* size) const;