diff options
author | nick <nick@chromium.org> | 2015-04-24 13:45:38 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-24 20:45:43 +0000 |
commit | ddb02ac66bad95bc04548a799eb2ce89a456b37c (patch) | |
tree | 948622946e37611fa5198b4dba00ad31ec15c7ec /chrome/browser/ui/views/frame/glass_browser_frame_view.h | |
parent | d9456757bec482f2b27cf75ef7fa2109af0500a6 (diff) | |
download | chromium_src-ddb02ac66bad95bc04548a799eb2ce89a456b37c.zip chromium_src-ddb02ac66bad95bc04548a799eb2ce89a456b37c.tar.gz chromium_src-ddb02ac66bad95bc04548a799eb2ce89a456b37c.tar.bz2 |
Update {virtual,override} to follow C++11 style in chrome.
The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override.
This patch was manually generated using a regex and a text editor.
BUG=417463
Review URL: https://codereview.chromium.org/1100223002
Cr-Commit-Position: refs/heads/master@{#326870}
Diffstat (limited to 'chrome/browser/ui/views/frame/glass_browser_frame_view.h')
-rw-r--r-- | chrome/browser/ui/views/frame/glass_browser_frame_view.h | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.h b/chrome/browser/ui/views/frame/glass_browser_frame_view.h index 7d29eb9..292d56e 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.h +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.h @@ -17,43 +17,41 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView, public: // Constructs a non-client view for an BrowserFrame. GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view); - virtual ~GlassBrowserFrameView(); + ~GlassBrowserFrameView() override; // BrowserNonClientFrameView: - virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override; - virtual int GetTopInset() const override; - virtual int GetThemeBackgroundXInset() const override; - virtual void UpdateThrobber(bool running) override; - virtual gfx::Size GetMinimumSize() const override; + gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override; + int GetTopInset() const override; + int GetThemeBackgroundXInset() const override; + void UpdateThrobber(bool running) override; + gfx::Size GetMinimumSize() const override; // views::NonClientFrameView: - virtual gfx::Rect GetBoundsForClientView() const override; - virtual gfx::Rect GetWindowBoundsForClientBounds( + gfx::Rect GetBoundsForClientView() const override; + 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 {} - virtual void SizeConstraintsChanged() 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 {} + void SizeConstraintsChanged() override {} protected: // views::View: - virtual void OnPaint(gfx::Canvas* canvas) override; - virtual void Layout() override; + void OnPaint(gfx::Canvas* canvas) override; + void Layout() override; // views::ButtonListener: - virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) override; + void ButtonPressed(views::Button* sender, const ui::Event& event) override; // BrowserNonClientFrameView: void UpdateNewAvatarButtonImpl() override; private: // views::NonClientFrameView: - virtual bool DoesIntersectRect(const views::View* target, - const gfx::Rect& rect) const override; + bool DoesIntersectRect(const views::View* target, + const gfx::Rect& rect) const override; // Returns the thickness of the border that makes up the window frame edges. // This does not include any client edge. |