Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(829)

Unified Diff: chrome/browser/ui/views/frame/glass_browser_frame_view.h

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/glass_browser_frame_view.h
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 7d29eb97acc76075d888b31521d532ce3011fdf3..292d56e1c71936b86d868ebc94560c282d1d08e6 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.

Powered by Google App Engine
This is Rietveld 408576698