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

Side by Side Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view.h

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_BROWSER_NON_CLIENT_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
7 7
8 #include "chrome/browser/ui/views/profiles/new_avatar_button.h" 8 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
9 #include "ui/views/window/non_client_view.h" 9 #include "ui/views/window/non_client_view.h"
10 10
(...skipping 14 matching lines...) Expand all
25 25
26 AvatarMenuButton* avatar_button() const { return avatar_button_; } 26 AvatarMenuButton* avatar_button() const { return avatar_button_; }
27 27
28 NewAvatarButton* new_avatar_button() const { return new_avatar_button_; } 28 NewAvatarButton* new_avatar_button() const { return new_avatar_button_; }
29 29
30 #if defined(ENABLE_MANAGED_USERS) 30 #if defined(ENABLE_MANAGED_USERS)
31 SupervisedUserAvatarLabel* supervised_user_avatar_label() const { 31 SupervisedUserAvatarLabel* supervised_user_avatar_label() const {
32 return supervised_user_avatar_label_; 32 return supervised_user_avatar_label_;
33 } 33 }
34 34
35 virtual void OnThemeChanged() OVERRIDE; 35 virtual void OnThemeChanged() override;
36 #endif 36 #endif
37 37
38 // Retrieves the bounds, in non-client view coordinates within which the 38 // Retrieves the bounds, in non-client view coordinates within which the
39 // TabStrip should be laid out. 39 // TabStrip should be laid out.
40 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const = 0; 40 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const = 0;
41 41
42 // Returns the inset of the topmost view in the client view from the top of 42 // Returns the inset of the topmost view in the client view from the top of
43 // the non-client view. The topmost view depends on the window type. The 43 // the non-client view. The topmost view depends on the window type. The
44 // topmost view is the tab strip for tabbed browser windows, the toolbar for 44 // topmost view is the tab strip for tabbed browser windows, the toolbar for
45 // popups, the web contents for app windows and varies for fullscreen windows. 45 // popups, the web contents for app windows and varies for fullscreen windows.
46 virtual int GetTopInset() const = 0; 46 virtual int GetTopInset() const = 0;
47 47
48 // Returns the amount that the theme background should be inset. 48 // Returns the amount that the theme background should be inset.
49 virtual int GetThemeBackgroundXInset() const = 0; 49 virtual int GetThemeBackgroundXInset() const = 0;
50 50
51 // Updates the throbber. 51 // Updates the throbber.
52 virtual void UpdateThrobber(bool running) = 0; 52 virtual void UpdateThrobber(bool running) = 0;
53 53
54 // Overriden from views::View. 54 // Overriden from views::View.
55 virtual void VisibilityChanged(views::View* starting_from, 55 virtual void VisibilityChanged(views::View* starting_from,
56 bool is_visible) OVERRIDE; 56 bool is_visible) override;
57 57
58 protected: 58 protected:
59 BrowserView* browser_view() const { return browser_view_; } 59 BrowserView* browser_view() const { return browser_view_; }
60 BrowserFrame* frame() const { return frame_; } 60 BrowserFrame* frame() const { return frame_; }
61 61
62 // Updates the title and icon of the avatar button. 62 // Updates the title and icon of the avatar button.
63 void UpdateAvatarInfo(); 63 void UpdateAvatarInfo();
64 64
65 // Updates the title of the avatar button displayed in the caption area. 65 // Updates the title of the avatar button displayed in the caption area.
66 // The button uses |style| to match the browser window style and notifies 66 // The button uses |style| to match the browser window style and notifies
(...skipping 23 matching lines...) Expand all
90 90
91 namespace chrome { 91 namespace chrome {
92 92
93 // Provided by a browser_non_client_frame_view_factory_*.cc implementation 93 // Provided by a browser_non_client_frame_view_factory_*.cc implementation
94 BrowserNonClientFrameView* CreateBrowserNonClientFrameView( 94 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
95 BrowserFrame* frame, BrowserView* browser_view); 95 BrowserFrame* frame, BrowserView* browser_view);
96 96
97 } // namespace chrome 97 } // namespace chrome
98 98
99 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_ 99 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698