diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 14:35:53 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 14:35:53 +0000 |
commit | ed803ac949bad652d1a33dabbddde2f3ed52b66d (patch) | |
tree | 0caf83a888efca27a94d9138076ac5c8023b65d5 /chrome/browser/ui/cocoa/browser_window_cocoa.h | |
parent | e7c634ef4fc3a30c6d983f5c47ba41b3982c88f7 (diff) | |
download | chromium_src-ed803ac949bad652d1a33dabbddde2f3ed52b66d.zip chromium_src-ed803ac949bad652d1a33dabbddde2f3ed52b66d.tar.gz chromium_src-ed803ac949bad652d1a33dabbddde2f3ed52b66d.tar.bz2 |
Add OVERRIDE to chrome/browser/ui/cocoa/.
BUG=104314
TEST=no change
Review URL: http://codereview.chromium.org/8603006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_cocoa.h')
-rw-r--r-- | chrome/browser/ui/cocoa/browser_window_cocoa.h | 141 |
1 files changed, 72 insertions, 69 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h index 3649169..79ad8bc 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h @@ -33,92 +33,95 @@ class BrowserWindowCocoa : public BrowserWindow, virtual ~BrowserWindowCocoa(); // Overridden from BrowserWindow - virtual void Show(); - virtual void ShowInactive(); - virtual void SetBounds(const gfx::Rect& bounds); - virtual void Close(); - virtual void Activate(); - virtual void Deactivate(); - virtual bool IsActive() const; - virtual void FlashFrame(); - virtual gfx::NativeWindow GetNativeHandle(); - virtual BrowserWindowTesting* GetBrowserWindowTesting(); - virtual StatusBubble* GetStatusBubble(); - virtual void ToolbarSizeChanged(bool is_animating); - virtual void UpdateTitleBar(); + virtual void Show() OVERRIDE; + virtual void ShowInactive() 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() OVERRIDE; + virtual gfx::NativeWindow GetNativeHandle() OVERRIDE; + virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; + virtual StatusBubble* GetStatusBubble() OVERRIDE; + virtual void ToolbarSizeChanged(bool is_animating) OVERRIDE; + virtual void UpdateTitleBar() OVERRIDE; virtual void BookmarkBarStateChanged( - BookmarkBar::AnimateChangeType change_type); - virtual void UpdateDevTools(); - virtual void UpdateLoadingAnimations(bool should_animate); - virtual void SetStarredState(bool is_starred); - virtual gfx::Rect GetRestoredBounds() const; - virtual gfx::Rect GetBounds() const; - virtual bool IsMaximized() const; - virtual bool IsMinimized() const; + BookmarkBar::AnimateChangeType change_type) OVERRIDE; + virtual void UpdateDevTools() OVERRIDE; + virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE; + virtual void SetStarredState(bool is_starred) OVERRIDE; + virtual gfx::Rect GetRestoredBounds() const OVERRIDE; + virtual gfx::Rect GetBounds() const OVERRIDE; + virtual bool IsMaximized() const OVERRIDE; + virtual bool IsMinimized() const OVERRIDE; virtual void EnterFullscreen( const GURL& url, FullscreenExitBubbleType type) OVERRIDE; virtual void ExitFullscreen() OVERRIDE; virtual void UpdateFullscreenExitBubbleContent( const GURL& url, FullscreenExitBubbleType bubble_type) OVERRIDE; - virtual bool IsFullscreen() const; - virtual bool IsFullscreenBubbleVisible() const; - virtual LocationBar* GetLocationBar() const; - virtual void SetFocusToLocationBar(bool select_all); - virtual void UpdateReloadStopState(bool is_loading, bool force); + 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(TabContentsWrapper* contents, - bool should_restore_state); - virtual void FocusToolbar(); - virtual void FocusAppMenu(); - virtual void FocusBookmarksToolbar(); - virtual void FocusChromeOSStatus(); - virtual void RotatePaneFocus(bool forwards); - virtual bool IsBookmarkBarVisible() const; - virtual bool IsBookmarkBarAnimating() const; - virtual bool IsTabStripEditable() const; - virtual bool IsToolbarVisible() const; + bool should_restore_state) OVERRIDE; + virtual void FocusToolbar() OVERRIDE; + virtual void FocusAppMenu() OVERRIDE; + virtual void FocusBookmarksToolbar() OVERRIDE; + virtual void FocusChromeOSStatus() 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 void ConfirmAddSearchProvider(const TemplateURL* template_url, - Profile* profile); - virtual void ToggleBookmarkBar(); - virtual void ShowAboutChromeDialog(); - virtual void ShowUpdateChromeDialog(); - virtual void ShowTaskManager(); - virtual void ShowBackgroundPages(); - virtual void ShowBookmarkBubble(const GURL& url, bool already_bookmarked); - virtual bool IsDownloadShelfVisible() const; - virtual DownloadShelf* GetDownloadShelf(); - virtual void ShowRepostFormWarningDialog(TabContents* tab_contents); - virtual void ShowCollectedCookiesDialog(TabContentsWrapper* wrapper); - virtual void ConfirmBrowserCloseWithPendingDownloads(); - virtual void UserChangedTheme(); - virtual int GetExtraRenderViewHeight() const; - virtual void TabContentsFocused(TabContents* tab_contents); + Profile* profile) OVERRIDE; + virtual void ToggleBookmarkBar() OVERRIDE; + virtual void ShowAboutChromeDialog() OVERRIDE; + virtual void ShowUpdateChromeDialog() OVERRIDE; + virtual void ShowTaskManager() OVERRIDE; + virtual void ShowBackgroundPages() OVERRIDE; + virtual void ShowBookmarkBubble(const GURL& url, + bool already_bookmarked) OVERRIDE; + virtual bool IsDownloadShelfVisible() const OVERRIDE; + virtual DownloadShelf* GetDownloadShelf() OVERRIDE; + virtual void ShowRepostFormWarningDialog(TabContents* tab_contents) OVERRIDE; + virtual void ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) OVERRIDE; + virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE; + virtual void UserChangedTheme() OVERRIDE; + virtual int GetExtraRenderViewHeight() const OVERRIDE; + virtual void TabContentsFocused(TabContents* tab_contents) OVERRIDE; virtual void ShowPageInfo(Profile* profile, const GURL& url, const NavigationEntry::SSLStatus& ssl, - bool show_history); - virtual void ShowAppMenu(); + bool show_history) OVERRIDE; + virtual void ShowAppMenu() OVERRIDE; virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, - bool* is_keyboard_shortcut); - virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event); + bool* is_keyboard_shortcut) OVERRIDE; + virtual void HandleKeyboardEvent( + const NativeWebKeyboardEvent& event) OVERRIDE; virtual void ShowCreateWebAppShortcutsDialog( - TabContentsWrapper* tab_contents); - virtual void ShowCreateChromeAppShortcutsDialog(Profile* profile, - const Extension* app); - virtual void Cut(); - virtual void Copy(); - virtual void Paste(); - virtual void OpenTabpose(); + TabContentsWrapper* tab_contents) OVERRIDE; + virtual void ShowCreateChromeAppShortcutsDialog( + Profile* profile, + const Extension* app) OVERRIDE; + virtual void Cut() OVERRIDE; + virtual void Copy() OVERRIDE; + virtual void Paste() OVERRIDE; + virtual void OpenTabpose() OVERRIDE; virtual void EnterPresentationMode( const GURL& url, FullscreenExitBubbleType bubble_type) OVERRIDE; virtual void ExitPresentationMode() OVERRIDE; - virtual bool InPresentationMode(); - virtual void ShowInstant(TabContentsWrapper* preview); - virtual void HideInstant(); - virtual gfx::Rect GetInstantBounds(); + virtual bool InPresentationMode() OVERRIDE; + virtual void ShowInstant(TabContentsWrapper* preview) OVERRIDE; + virtual void HideInstant() OVERRIDE; + virtual gfx::Rect GetInstantBounds() OVERRIDE; virtual WindowOpenDisposition GetDispositionForPopupBounds( - const gfx::Rect& bounds); + const gfx::Rect& bounds) OVERRIDE; virtual FindBar* CreateFindBar() OVERRIDE; virtual void ShowAvatarBubble(TabContents* tab_contents, const gfx::Rect& rect) OVERRIDE; @@ -127,7 +130,7 @@ class BrowserWindowCocoa : public BrowserWindow, // Overridden from NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Adds the given FindBar cocoa controller to this browser window. void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); @@ -136,7 +139,7 @@ class BrowserWindowCocoa : public BrowserWindow, BrowserWindowController* cocoa_controller() { return controller_; } protected: - virtual void DestroyBrowser(); + virtual void DestroyBrowser() OVERRIDE; private: NSWindow* window() const; // Accessor for the (current) |NSWindow|. |