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

Side by Side Diff: chrome/browser/ui/views/frame/browser_frame.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_FRAME_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/prefs/pref_member.h" 10 #include "base/prefs/pref_member.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 bool UseCustomFrame() const; 80 bool UseCustomFrame() const;
81 81
82 // Returns true when the window placement should be saved. 82 // Returns true when the window placement should be saved.
83 bool ShouldSaveWindowPlacement() const; 83 bool ShouldSaveWindowPlacement() const;
84 84
85 // Retrieves the window placement (show state and bounds) for restoring. 85 // Retrieves the window placement (show state and bounds) for restoring.
86 void GetWindowPlacement(gfx::Rect* bounds, 86 void GetWindowPlacement(gfx::Rect* bounds,
87 ui::WindowShowState* show_state) const; 87 ui::WindowShowState* show_state) const;
88 88
89 // Overridden from views::Widget: 89 // Overridden from views::Widget:
90 virtual views::internal::RootView* CreateRootView() OVERRIDE; 90 virtual views::internal::RootView* CreateRootView() override;
91 virtual views::NonClientFrameView* CreateNonClientFrameView() OVERRIDE; 91 virtual views::NonClientFrameView* CreateNonClientFrameView() override;
92 virtual bool GetAccelerator(int command_id, 92 virtual bool GetAccelerator(int command_id,
93 ui::Accelerator* accelerator) const OVERRIDE; 93 ui::Accelerator* accelerator) const override;
94 virtual ui::ThemeProvider* GetThemeProvider() const OVERRIDE; 94 virtual ui::ThemeProvider* GetThemeProvider() const override;
95 virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE; 95 virtual void SchedulePaintInRect(const gfx::Rect& rect) override;
96 virtual void OnNativeWidgetActivationChanged(bool active) OVERRIDE; 96 virtual void OnNativeWidgetActivationChanged(bool active) override;
97 97
98 // Overridden from views::ContextMenuController: 98 // Overridden from views::ContextMenuController:
99 virtual void ShowContextMenuForView(views::View* source, 99 virtual void ShowContextMenuForView(views::View* source,
100 const gfx::Point& p, 100 const gfx::Point& p,
101 ui::MenuSourceType source_type) OVERRIDE; 101 ui::MenuSourceType source_type) override;
102 102
103 // Returns true if we should leave any offset at the frame caption. Typically 103 // Returns true if we should leave any offset at the frame caption. Typically
104 // when the frame is maximized/full screen we want to leave no offset at the 104 // when the frame is maximized/full screen we want to leave no offset at the
105 // top. 105 // top.
106 bool ShouldLeaveOffsetNearTopBorder(); 106 bool ShouldLeaveOffsetNearTopBorder();
107 107
108 AvatarMenuButton* GetAvatarMenuButton(); 108 AvatarMenuButton* GetAvatarMenuButton();
109 109
110 NewAvatarButton* GetNewAvatarMenuButton(); 110 NewAvatarButton* GetNewAvatarMenuButton();
111 111
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 // Whether the custom Chrome frame preference is set. 146 // Whether the custom Chrome frame preference is set.
147 BooleanPrefMember use_custom_frame_pref_; 147 BooleanPrefMember use_custom_frame_pref_;
148 148
149 scoped_ptr<ui::EventHandler> browser_command_handler_; 149 scoped_ptr<ui::EventHandler> browser_command_handler_;
150 150
151 DISALLOW_COPY_AND_ASSIGN(BrowserFrame); 151 DISALLOW_COPY_AND_ASSIGN(BrowserFrame);
152 }; 152 };
153 153
154 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ 154 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698