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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 686463004: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/browser_root_view.h ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_view.h
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 55064cf8f14b1ee261e83a33a125cdddfa5c1066..50cc41c8bcc7a33fa723b8e6838c5605a731883b 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -99,7 +99,7 @@ class BrowserView : public BrowserWindow,
static const char kViewClassName[];
BrowserView();
- virtual ~BrowserView();
+ ~BrowserView() override;
// Takes ownership of |browser|.
void Init(Browser* browser);
@@ -246,83 +246,80 @@ class BrowserView : public BrowserWindow,
void ToolbarSizeChanged(bool is_animating);
// Overridden from BrowserWindow:
- virtual void Show() override;
- virtual void ShowInactive() override;
- virtual void Hide() override;
- virtual void SetBounds(const gfx::Rect& bounds) override;
- virtual void Close() override;
- virtual void Activate() override;
- virtual void Deactivate() override;
- virtual bool IsActive() const override;
- virtual void FlashFrame(bool flash) override;
- virtual bool IsAlwaysOnTop() const override;
- virtual void SetAlwaysOnTop(bool always_on_top) override;
- virtual gfx::NativeWindow GetNativeWindow() override;
- virtual BrowserWindowTesting* GetBrowserWindowTesting() override;
- virtual StatusBubble* GetStatusBubble() override;
- virtual void UpdateTitleBar() override;
- virtual void BookmarkBarStateChanged(
+ void Show() override;
+ void ShowInactive() override;
+ void Hide() override;
+ void SetBounds(const gfx::Rect& bounds) override;
+ void Close() override;
+ void Activate() override;
+ void Deactivate() override;
+ bool IsActive() const override;
+ void FlashFrame(bool flash) override;
+ bool IsAlwaysOnTop() const override;
+ void SetAlwaysOnTop(bool always_on_top) override;
+ gfx::NativeWindow GetNativeWindow() override;
+ BrowserWindowTesting* GetBrowserWindowTesting() override;
+ StatusBubble* GetStatusBubble() override;
+ void UpdateTitleBar() override;
+ void BookmarkBarStateChanged(
BookmarkBar::AnimateChangeType change_type) override;
- virtual void UpdateDevTools() override;
- virtual void UpdateLoadingAnimations(bool should_animate) override;
- virtual void SetStarredState(bool is_starred) override;
- virtual void SetTranslateIconToggled(bool is_lit) override;
- virtual void OnActiveTabChanged(content::WebContents* old_contents,
- content::WebContents* new_contents,
- int index,
- int reason) override;
- virtual void ZoomChangedForActiveTab(bool can_show_bubble) override;
- virtual gfx::Rect GetRestoredBounds() const override;
- virtual ui::WindowShowState GetRestoredState() const override;
- virtual gfx::Rect GetBounds() const override;
- virtual bool IsMaximized() const override;
- virtual bool IsMinimized() const override;
- virtual void Maximize() override;
- virtual void Minimize() override;
- virtual void Restore() override;
- virtual void EnterFullscreen(
- const GURL& url, FullscreenExitBubbleType bubble_type) override;
- virtual void ExitFullscreen() override;
- virtual void UpdateFullscreenExitBubbleContent(
+ void UpdateDevTools() override;
+ void UpdateLoadingAnimations(bool should_animate) override;
+ void SetStarredState(bool is_starred) override;
+ void SetTranslateIconToggled(bool is_lit) override;
+ void OnActiveTabChanged(content::WebContents* old_contents,
+ content::WebContents* new_contents,
+ int index,
+ int reason) override;
+ void ZoomChangedForActiveTab(bool can_show_bubble) override;
+ gfx::Rect GetRestoredBounds() const override;
+ ui::WindowShowState GetRestoredState() const override;
+ gfx::Rect GetBounds() const override;
+ bool IsMaximized() const override;
+ bool IsMinimized() const override;
+ void Maximize() override;
+ void Minimize() override;
+ void Restore() override;
+ void EnterFullscreen(const GURL& url,
+ FullscreenExitBubbleType bubble_type) override;
+ void ExitFullscreen() override;
+ void UpdateFullscreenExitBubbleContent(
const GURL& url,
FullscreenExitBubbleType bubble_type) override;
- virtual bool ShouldHideUIForFullscreen() const override;
- virtual bool IsFullscreen() const override;
- virtual bool IsFullscreenBubbleVisible() const override;
+ bool ShouldHideUIForFullscreen() const override;
+ bool IsFullscreen() const override;
+ bool IsFullscreenBubbleVisible() const override;
#if defined(OS_WIN)
virtual void SetMetroSnapMode(bool enable) override;
virtual bool IsInMetroSnapMode() const override;
#endif
- virtual LocationBar* GetLocationBar() const override;
- virtual void SetFocusToLocationBar(bool select_all) override;
- virtual void UpdateReloadStopState(bool is_loading, bool force) override;
- virtual void UpdateToolbar(content::WebContents* contents) override;
- virtual void FocusToolbar() override;
- virtual void FocusAppMenu() override;
- virtual void FocusBookmarksToolbar() override;
- virtual void FocusInfobars() override;
- virtual void RotatePaneFocus(bool forwards) override;
- virtual void DestroyBrowser() override;
- virtual bool IsBookmarkBarVisible() const override;
- virtual bool IsBookmarkBarAnimating() const override;
- virtual bool IsTabStripEditable() const override;
- virtual bool IsToolbarVisible() const override;
- virtual gfx::Rect GetRootWindowResizerRect() const override;
- virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
- Profile* profile) override;
- virtual void ShowUpdateChromeDialog() override;
- virtual void ShowBookmarkBubble(const GURL& url,
- bool already_bookmarked) override;
- virtual void ShowBookmarkAppBubble(
- const WebApplicationInfo& web_app_info,
- const std::string& extension_id) override;
- virtual void ShowTranslateBubble(
- content::WebContents* contents,
- translate::TranslateStep step,
- translate::TranslateErrors::Type error_type,
- bool is_user_gesture) override;
+ LocationBar* GetLocationBar() const override;
+ void SetFocusToLocationBar(bool select_all) override;
+ void UpdateReloadStopState(bool is_loading, bool force) override;
+ void UpdateToolbar(content::WebContents* contents) override;
+ void FocusToolbar() override;
+ void FocusAppMenu() override;
+ void FocusBookmarksToolbar() override;
+ void FocusInfobars() override;
+ void RotatePaneFocus(bool forwards) override;
+ void DestroyBrowser() override;
+ bool IsBookmarkBarVisible() const override;
+ bool IsBookmarkBarAnimating() const override;
+ bool IsTabStripEditable() const override;
+ bool IsToolbarVisible() const override;
+ gfx::Rect GetRootWindowResizerRect() const override;
+ void ConfirmAddSearchProvider(TemplateURL* template_url,
+ Profile* profile) override;
+ void ShowUpdateChromeDialog() override;
+ void ShowBookmarkBubble(const GURL& url, bool already_bookmarked) override;
+ void ShowBookmarkAppBubble(const WebApplicationInfo& web_app_info,
+ const std::string& extension_id) override;
+ void ShowTranslateBubble(content::WebContents* contents,
+ translate::TranslateStep step,
+ translate::TranslateErrors::Type error_type,
+ bool is_user_gesture) override;
#if defined(ENABLE_ONE_CLICK_SIGNIN)
- virtual void ShowOneClickSigninBubble(
+ void ShowOneClickSigninBubble(
OneClickSigninBubbleType type,
const base::string16& email,
const base::string16& error_message,
@@ -330,122 +327,118 @@ class BrowserView : public BrowserWindow,
#endif
// TODO(beng): Not an override, move somewhere else.
void SetDownloadShelfVisible(bool visible);
- virtual bool IsDownloadShelfVisible() const override;
- virtual DownloadShelf* GetDownloadShelf() override;
- virtual void ConfirmBrowserCloseWithPendingDownloads(
+ bool IsDownloadShelfVisible() const override;
+ DownloadShelf* GetDownloadShelf() override;
+ void ConfirmBrowserCloseWithPendingDownloads(
int download_count,
Browser::DownloadClosePreventionType dialog_type,
bool app_modal,
const base::Callback<void(bool)>& callback) override;
- virtual void UserChangedTheme() override;
- virtual int GetExtraRenderViewHeight() const override;
- virtual void WebContentsFocused(content::WebContents* contents) override;
- virtual void ShowWebsiteSettings(Profile* profile,
- content::WebContents* web_contents,
- const GURL& url,
- const content::SSLStatus& ssl) override;
- virtual void ShowAppMenu() override;
- virtual bool PreHandleKeyboardEvent(
- const content::NativeWebKeyboardEvent& event,
- bool* is_keyboard_shortcut) override;
- virtual void HandleKeyboardEvent(
+ void UserChangedTheme() override;
+ int GetExtraRenderViewHeight() const override;
+ void WebContentsFocused(content::WebContents* contents) override;
+ void ShowWebsiteSettings(Profile* profile,
+ content::WebContents* web_contents,
+ const GURL& url,
+ const content::SSLStatus& ssl) override;
+ void ShowAppMenu() override;
+ bool PreHandleKeyboardEvent(const content::NativeWebKeyboardEvent& event,
+ bool* is_keyboard_shortcut) override;
+ void HandleKeyboardEvent(
const content::NativeWebKeyboardEvent& event) override;
- virtual void Cut() override;
- virtual void Copy() override;
- virtual void Paste() override;
- virtual WindowOpenDisposition GetDispositionForPopupBounds(
+ void Cut() override;
+ void Copy() override;
+ void Paste() override;
+ WindowOpenDisposition GetDispositionForPopupBounds(
const gfx::Rect& bounds) override;
- virtual FindBar* CreateFindBar() override;
- virtual web_modal::WebContentsModalDialogHost*
- GetWebContentsModalDialogHost() override;
- virtual void ShowAvatarBubble(content::WebContents* web_contents,
- const gfx::Rect& rect) override;
- virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
+ FindBar* CreateFindBar() override;
+ web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
+ override;
+ void ShowAvatarBubble(content::WebContents* web_contents,
+ const gfx::Rect& rect) override;
+ void ShowAvatarBubbleFromAvatarButton(
+ AvatarBubbleMode mode,
const signin::ManageAccountsParams& manage_accounts_params) override;
- virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
- virtual void ExecuteExtensionCommand(
- const extensions::Extension* extension,
- const extensions::Command& command) override;
+ int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
+ void ExecuteExtensionCommand(const extensions::Extension* extension,
+ const extensions::Command& command) override;
// Overridden from BrowserWindowTesting:
- virtual BookmarkBarView* GetBookmarkBarView() const override;
- virtual LocationBarView* GetLocationBarView() const override;
- virtual views::View* GetTabContentsContainerView() const override;
- virtual ToolbarView* GetToolbarView() const override;
+ BookmarkBarView* GetBookmarkBarView() const override;
+ LocationBarView* GetLocationBarView() const override;
+ views::View* GetTabContentsContainerView() const override;
+ ToolbarView* GetToolbarView() const override;
// Overridden from TabStripModelObserver:
- virtual void TabInsertedAt(content::WebContents* contents,
- int index,
- bool foreground) override;
- virtual void TabDetachedAt(content::WebContents* contents,
- int index) override;
- virtual void TabDeactivated(content::WebContents* contents) override;
- virtual void TabStripEmpty() override;
- virtual void WillCloseAllTabs() override;
- virtual void CloseAllTabsCanceled() override;
+ void TabInsertedAt(content::WebContents* contents,
+ int index,
+ bool foreground) override;
+ void TabDetachedAt(content::WebContents* contents, int index) override;
+ void TabDeactivated(content::WebContents* contents) override;
+ void TabStripEmpty() override;
+ void WillCloseAllTabs() override;
+ void CloseAllTabsCanceled() override;
// Overridden from ui::AcceleratorProvider:
- virtual bool GetAcceleratorForCommandId(int command_id,
- ui::Accelerator* accelerator) override;
+ bool GetAcceleratorForCommandId(int command_id,
+ ui::Accelerator* accelerator) override;
// Overridden from views::WidgetDelegate:
- virtual bool CanResize() const override;
- virtual bool CanMaximize() const override;
- virtual bool CanMinimize() const override;
- virtual bool CanActivate() const override;
- virtual base::string16 GetWindowTitle() const override;
- virtual base::string16 GetAccessibleWindowTitle() const override;
- virtual views::View* GetInitiallyFocusedView() override;
- virtual bool ShouldShowWindowTitle() const override;
- virtual gfx::ImageSkia GetWindowAppIcon() override;
- virtual gfx::ImageSkia GetWindowIcon() override;
- virtual bool ShouldShowWindowIcon() const override;
- virtual bool ExecuteWindowsCommand(int command_id) override;
- virtual std::string GetWindowName() const override;
- virtual void SaveWindowPlacement(const gfx::Rect& bounds,
- ui::WindowShowState show_state) override;
- virtual bool GetSavedWindowPlacement(
- const views::Widget* widget,
- gfx::Rect* bounds,
- ui::WindowShowState* show_state) const override;
- virtual views::View* GetContentsView() override;
- virtual views::ClientView* CreateClientView(views::Widget* widget) override;
- virtual void OnWindowBeginUserBoundsChange() override;
- virtual void OnWidgetMove() override;
- virtual views::Widget* GetWidget() override;
- virtual const views::Widget* GetWidget() const override;
- virtual void GetAccessiblePanes(std::vector<View*>* panes) override;
+ bool CanResize() const override;
+ bool CanMaximize() const override;
+ bool CanMinimize() const override;
+ bool CanActivate() const override;
+ base::string16 GetWindowTitle() const override;
+ base::string16 GetAccessibleWindowTitle() const override;
+ views::View* GetInitiallyFocusedView() override;
+ bool ShouldShowWindowTitle() const override;
+ gfx::ImageSkia GetWindowAppIcon() override;
+ gfx::ImageSkia GetWindowIcon() override;
+ bool ShouldShowWindowIcon() const override;
+ bool ExecuteWindowsCommand(int command_id) override;
+ std::string GetWindowName() const override;
+ void SaveWindowPlacement(const gfx::Rect& bounds,
+ ui::WindowShowState show_state) override;
+ bool GetSavedWindowPlacement(const views::Widget* widget,
+ gfx::Rect* bounds,
+ ui::WindowShowState* show_state) const override;
+ views::View* GetContentsView() override;
+ views::ClientView* CreateClientView(views::Widget* widget) override;
+ void OnWindowBeginUserBoundsChange() override;
+ void OnWidgetMove() override;
+ views::Widget* GetWidget() override;
+ const views::Widget* GetWidget() const override;
+ void GetAccessiblePanes(std::vector<View*>* panes) override;
// Overridden from views::WidgetObserver:
- virtual void OnWidgetActivationChanged(views::Widget* widget,
- bool active) override;
+ void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
// Overridden from views::ClientView:
- virtual bool CanClose() override;
- virtual int NonClientHitTest(const gfx::Point& point) override;
- virtual gfx::Size GetMinimumSize() const override;
+ bool CanClose() override;
+ int NonClientHitTest(const gfx::Point& point) override;
+ gfx::Size GetMinimumSize() const override;
// InfoBarContainer::Delegate overrides
- virtual SkColor GetInfoBarSeparatorColor() const override;
- virtual void InfoBarContainerStateChanged(bool is_animating) override;
- virtual bool DrawInfoBarArrows(int* x) const override;
+ SkColor GetInfoBarSeparatorColor() const override;
+ void InfoBarContainerStateChanged(bool is_animating) override;
+ bool DrawInfoBarArrows(int* x) const override;
// Overridden from views::View:
- virtual const char* GetClassName() const override;
- virtual void Layout() override;
- virtual void PaintChildren(gfx::Canvas* canvas,
- const views::CullSet& cull_set) override;
- virtual void ViewHierarchyChanged(
+ const char* GetClassName() const override;
+ void Layout() override;
+ void PaintChildren(gfx::Canvas* canvas,
+ const views::CullSet& cull_set) override;
+ void ViewHierarchyChanged(
const ViewHierarchyChangedDetails& details) override;
- virtual void ChildPreferredSizeChanged(View* child) override;
- virtual void GetAccessibleState(ui::AXViewState* state) override;
- virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
+ void ChildPreferredSizeChanged(View* child) override;
+ void GetAccessibleState(ui::AXViewState* state) override;
+ void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
// Overridden from ui::AcceleratorTarget:
- virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
+ bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
// OmniboxPopupModelObserver overrides
- virtual void OnOmniboxPopupShownOrHidden() override;
+ void OnOmniboxPopupShownOrHidden() override;
// Testing interface:
views::View* GetContentsContainerForTest() { return contents_container_; }
@@ -477,7 +470,7 @@ class BrowserView : public BrowserWindow,
// LoadCompleteListener::Delegate implementation. Creates and initializes the
// |jumplist_| after the first page load.
- virtual void OnLoadCompleted() override;
+ void OnLoadCompleted() override;
// Returns the BrowserViewLayout.
BrowserViewLayout* GetBrowserViewLayout() const;
« no previous file with comments | « chrome/browser/ui/views/frame/browser_root_view.h ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698