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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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
« no previous file with comments | « chrome/browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 721fe2d40fac15fdc5f3a880995bc5b3d6170d6b..d5c59cfc68a076be371cc77c5838addfe18c4770 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
@@ -41,130 +41,130 @@ class BrowserWindowCocoa :
virtual ~BrowserWindowCocoa();
// 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 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(
- 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;
+ 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;
+ 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;
+ const GURL& url, FullscreenExitBubbleType type) override;
+ virtual void ExitFullscreen() override;
virtual 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;
+ 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;
+ Profile* profile) override;
+ virtual void ShowUpdateChromeDialog() override;
virtual void ShowBookmarkBubble(const GURL& url,
- bool already_bookmarked) OVERRIDE;
+ bool already_bookmarked) override;
virtual void ShowBookmarkAppBubble(
const WebApplicationInfo& web_app_info,
- const std::string& extension_id) OVERRIDE;
+ 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 is_user_gesture) override;
#if defined(ENABLE_ONE_CLICK_SIGNIN)
virtual void ShowOneClickSigninBubble(
OneClickSigninBubbleType type,
const base::string16& email,
const base::string16& error_message,
- const StartSyncCallback& start_sync_callback) OVERRIDE;
+ const StartSyncCallback& start_sync_callback) override;
#endif
- virtual bool IsDownloadShelfVisible() const OVERRIDE;
- virtual DownloadShelf* GetDownloadShelf() OVERRIDE;
+ virtual bool IsDownloadShelfVisible() const override;
+ virtual DownloadShelf* GetDownloadShelf() override;
virtual 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;
+ 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;
+ const content::SSLStatus& ssl) override;
+ virtual void ShowAppMenu() override;
virtual bool PreHandleKeyboardEvent(
const content::NativeWebKeyboardEvent& event,
- bool* is_keyboard_shortcut) OVERRIDE;
+ bool* is_keyboard_shortcut) override;
virtual void HandleKeyboardEvent(
- const content::NativeWebKeyboardEvent& event) OVERRIDE;
- virtual void Cut() OVERRIDE;
- virtual void Copy() OVERRIDE;
- virtual void Paste() OVERRIDE;
- virtual void EnterFullscreenWithChrome() OVERRIDE;
- virtual bool IsFullscreenWithChrome() OVERRIDE;
- virtual bool IsFullscreenWithoutChrome() OVERRIDE;
+ const content::NativeWebKeyboardEvent& event) override;
+ virtual void Cut() override;
+ virtual void Copy() override;
+ virtual void Paste() override;
+ virtual void EnterFullscreenWithChrome() override;
+ virtual bool IsFullscreenWithChrome() override;
+ virtual bool IsFullscreenWithoutChrome() override;
virtual WindowOpenDisposition GetDispositionForPopupBounds(
- const gfx::Rect& bounds) OVERRIDE;
- virtual FindBar* CreateFindBar() OVERRIDE;
+ const gfx::Rect& bounds) override;
+ virtual FindBar* CreateFindBar() override;
virtual web_modal::WebContentsModalDialogHost*
- GetWebContentsModalDialogHost() OVERRIDE;
+ GetWebContentsModalDialogHost() override;
virtual void ShowAvatarBubble(content::WebContents* web_contents,
- const gfx::Rect& rect) OVERRIDE;
+ const gfx::Rect& rect) override;
virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
- const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE;
- virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE;
+ const signin::ManageAccountsParams& manage_accounts_params) override;
+ virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
virtual void ExecuteExtensionCommand(
const extensions::Extension* extension,
- const extensions::Command& command) OVERRIDE;
+ const extensions::Command& command) override;
// Overridden from ExtensionKeybindingRegistry::Delegate:
virtual extensions::ActiveTabPermissionGranter*
- GetActiveTabPermissionGranter() OVERRIDE;
+ GetActiveTabPermissionGranter() override;
// Overridden from SearchModelObserver:
virtual void ModelChanged(const SearchModel::State& old_state,
- const SearchModel::State& new_state) OVERRIDE;
+ const SearchModel::State& new_state) override;
// Adds the given FindBar cocoa controller to this browser window.
void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller);
@@ -173,7 +173,7 @@ class BrowserWindowCocoa :
BrowserWindowController* cocoa_controller() { return controller_; }
protected:
- virtual void DestroyBrowser() OVERRIDE;
+ virtual void DestroyBrowser() override;
private:
NSWindow* window() const; // Accessor for the (current) |NSWindow|.
« no previous file with comments | « chrome/browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698