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

Side by Side 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, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
10 #include "ui/views/controls/button/button.h" 10 #include "ui/views/controls/button/button.h"
11 #include "ui/views/window/non_client_view.h" 11 #include "ui/views/window/non_client_view.h"
12 12
13 class BrowserView; 13 class BrowserView;
14 14
15 class GlassBrowserFrameView : public BrowserNonClientFrameView, 15 class GlassBrowserFrameView : public BrowserNonClientFrameView,
16 public views::ButtonListener { 16 public views::ButtonListener {
17 public: 17 public:
18 // Constructs a non-client view for an BrowserFrame. 18 // Constructs a non-client view for an BrowserFrame.
19 GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view); 19 GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
20 virtual ~GlassBrowserFrameView(); 20 ~GlassBrowserFrameView() override;
21 21
22 // BrowserNonClientFrameView: 22 // BrowserNonClientFrameView:
23 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override; 23 gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override;
24 virtual int GetTopInset() const override; 24 int GetTopInset() const override;
25 virtual int GetThemeBackgroundXInset() const override; 25 int GetThemeBackgroundXInset() const override;
26 virtual void UpdateThrobber(bool running) override; 26 void UpdateThrobber(bool running) override;
27 virtual gfx::Size GetMinimumSize() const override; 27 gfx::Size GetMinimumSize() const override;
28 28
29 // views::NonClientFrameView: 29 // views::NonClientFrameView:
30 virtual gfx::Rect GetBoundsForClientView() const override; 30 gfx::Rect GetBoundsForClientView() const override;
31 virtual gfx::Rect GetWindowBoundsForClientBounds( 31 gfx::Rect GetWindowBoundsForClientBounds(
32 const gfx::Rect& client_bounds) const override; 32 const gfx::Rect& client_bounds) const override;
33 virtual int NonClientHitTest(const gfx::Point& point) override; 33 int NonClientHitTest(const gfx::Point& point) override;
34 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) 34 void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override {}
35 override {} 35 void ResetWindowControls() override {}
36 virtual void ResetWindowControls() override {} 36 void UpdateWindowIcon() override {}
37 virtual void UpdateWindowIcon() override {} 37 void UpdateWindowTitle() override {}
38 virtual void UpdateWindowTitle() override {} 38 void SizeConstraintsChanged() override {}
39 virtual void SizeConstraintsChanged() override {}
40 39
41 protected: 40 protected:
42 // views::View: 41 // views::View:
43 virtual void OnPaint(gfx::Canvas* canvas) override; 42 void OnPaint(gfx::Canvas* canvas) override;
44 virtual void Layout() override; 43 void Layout() override;
45 44
46 // views::ButtonListener: 45 // views::ButtonListener:
47 virtual void ButtonPressed(views::Button* sender, 46 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
48 const ui::Event& event) override;
49 47
50 // BrowserNonClientFrameView: 48 // BrowserNonClientFrameView:
51 void UpdateNewAvatarButtonImpl() override; 49 void UpdateNewAvatarButtonImpl() override;
52 50
53 private: 51 private:
54 // views::NonClientFrameView: 52 // views::NonClientFrameView:
55 virtual bool DoesIntersectRect(const views::View* target, 53 bool DoesIntersectRect(const views::View* target,
56 const gfx::Rect& rect) const override; 54 const gfx::Rect& rect) const override;
57 55
58 // Returns the thickness of the border that makes up the window frame edges. 56 // Returns the thickness of the border that makes up the window frame edges.
59 // This does not include any client edge. 57 // This does not include any client edge.
60 int FrameBorderThickness() const; 58 int FrameBorderThickness() const;
61 59
62 // Returns the thickness of the entire nonclient left, right, and bottom 60 // Returns the thickness of the entire nonclient left, right, and bottom
63 // borders, including both the window frame and any client edge. 61 // borders, including both the window frame and any client edge.
64 int NonClientBorderThickness() const; 62 int NonClientBorderThickness() const;
65 63
66 // Returns the height of the entire nonclient top border, including the window 64 // Returns the height of the entire nonclient top border, including the window
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 int throbber_frame_; 100 int throbber_frame_;
103 101
104 static const int kThrobberIconCount = 24; 102 static const int kThrobberIconCount = 24;
105 static HICON throbber_icons_[kThrobberIconCount]; 103 static HICON throbber_icons_[kThrobberIconCount];
106 static void InitThrobberIcons(); 104 static void InitThrobberIcons();
107 105
108 DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView); 106 DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView);
109 }; 107 };
110 108
111 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 109 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698