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

Unified Diff: chrome/browser/ui/cocoa/browser_window_cocoa.h

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser_window_cocoa.h
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
index d184dfd31acfff64ea4d8a1da504f7ab2532720f..21f0be6cea2ea12b308cbdc16edfe7171a0f8ea6 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
@@ -38,134 +38,129 @@ class BrowserWindowCocoa :
public:
BrowserWindowCocoa(Browser* browser,
BrowserWindowController* controller);
- virtual ~BrowserWindowCocoa();
+ ~BrowserWindowCocoa() override;
// 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 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 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;
- 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 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;
+ bool ShouldHideUIForFullscreen() const override;
+ bool IsFullscreen() const override;
+ bool IsFullscreenBubbleVisible() const 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;
+ 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,
const StartSyncCallback& start_sync_callback) override;
#endif
- 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 void EnterFullscreenWithChrome() override;
- virtual void EnterFullscreenWithoutChrome() override;
- virtual bool IsFullscreenWithChrome() override;
- virtual bool IsFullscreenWithoutChrome() override;
- virtual WindowOpenDisposition GetDispositionForPopupBounds(
+ void Cut() override;
+ void Copy() override;
+ void Paste() override;
+ void EnterFullscreenWithChrome() override;
+ void EnterFullscreenWithoutChrome() override;
+ bool IsFullscreenWithChrome() override;
+ bool IsFullscreenWithoutChrome() 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 ExtensionKeybindingRegistry::Delegate:
- virtual extensions::ActiveTabPermissionGranter*
- GetActiveTabPermissionGranter() override;
+ extensions::ActiveTabPermissionGranter* GetActiveTabPermissionGranter()
+ override;
// Overridden from SearchModelObserver:
- virtual void ModelChanged(const SearchModel::State& old_state,
- const SearchModel::State& new_state) override;
+ void ModelChanged(const SearchModel::State& old_state,
+ const SearchModel::State& new_state) override;
// Adds the given FindBar cocoa controller to this browser window.
void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller);
@@ -174,7 +169,7 @@ class BrowserWindowCocoa :
BrowserWindowController* cocoa_controller() { return controller_; }
protected:
- virtual void DestroyBrowser() override;
+ void DestroyBrowser() override;
private:
NSWindow* window() const; // Accessor for the (current) |NSWindow|.

Powered by Google App Engine
This is Rietveld 408576698