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 | |
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')
29 files changed, 227 insertions, 215 deletions
diff --git a/chrome/browser/ui/cocoa/about_ipc_dialog.h b/chrome/browser/ui/cocoa/about_ipc_dialog.h index f93fff9..bd18ea47 100644 --- a/chrome/browser/ui/cocoa/about_ipc_dialog.h +++ b/chrome/browser/ui/cocoa/about_ipc_dialog.h @@ -26,7 +26,7 @@ class AboutIPCBridge : public IPC::Logging::Consumer { virtual ~AboutIPCBridge() { } // IPC::Logging::Consumer implementation. - virtual void Log(const IPC::LogData& data); + virtual void Log(const IPC::LogData& data) OVERRIDE; private: AboutIPCController* controller_; // weak; owns me diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h index e870af2..789e673 100644 --- a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h +++ b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h @@ -41,7 +41,7 @@ class BookmarkAppleScriptTest : public CocoaProfileTest { public: BookmarkAppleScriptTest(); virtual ~BookmarkAppleScriptTest(); - virtual void SetUp(); + virtual void SetUp() OVERRIDE; private: scoped_nsobject<FakeAppDelegate> appDelegate_; protected: 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|. diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.h b/chrome/browser/ui/cocoa/cocoa_profile_test.h index 7fe4a7d..5af3314 100644 --- a/chrome/browser/ui/cocoa/cocoa_profile_test.h +++ b/chrome/browser/ui/cocoa/cocoa_profile_test.h @@ -37,9 +37,9 @@ class CocoaProfileTest : public CocoaTest { // succeed, else it will ASSERT and cause the test to fail. Subclasses that // do work in SetUp should ASSERT that either browser() or profile() are // non-NULL before proceeding after the call to super (this). - virtual void SetUp(); + virtual void SetUp() OVERRIDE; - virtual void TearDown(); + virtual void TearDown() OVERRIDE; TestingProfileManager* testing_profile_manager() { return &profile_manager_; diff --git a/chrome/browser/ui/cocoa/command_observer_bridge.h b/chrome/browser/ui/cocoa/command_observer_bridge.h index 74179dd..a10c918 100644 --- a/chrome/browser/ui/cocoa/command_observer_bridge.h +++ b/chrome/browser/ui/cocoa/command_observer_bridge.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,7 @@ #import <Cocoa/Cocoa.h> +#include "base/compiler_specific.h" #include "chrome/browser/command_updater.h" @protocol CommandObserverProtocol; @@ -31,7 +32,8 @@ class CommandObserverBridge : public CommandUpdater::CommandObserver { protected: // Overridden from CommandUpdater::CommandObserver - virtual void EnabledStateChangedForCommand(int command, bool enabled); + virtual void EnabledStateChangedForCommand(int command, + bool enabled) OVERRIDE; private: id<CommandObserverProtocol> observer_; // weak, owns me diff --git a/chrome/browser/ui/cocoa/constrained_window_mac.h b/chrome/browser/ui/cocoa/constrained_window_mac.h index d5ded4d..ca28fda 100644 --- a/chrome/browser/ui/cocoa/constrained_window_mac.h +++ b/chrome/browser/ui/cocoa/constrained_window_mac.h @@ -69,7 +69,7 @@ class ConstrainedWindowMacDelegateSystemSheet private: virtual void RunSheet(GTMWindowSheetController* sheetController, - NSView* view); + NSView* view) OVERRIDE; scoped_nsobject<id> systemSheet_; scoped_nsobject<id> delegate_; SEL didEndSelector_; @@ -92,7 +92,7 @@ class ConstrainedWindowMacDelegateCustomSheet private: virtual void RunSheet(GTMWindowSheetController* sheetController, - NSView* view); + NSView* view) OVERRIDE; scoped_nsobject<NSWindow> customSheet_; scoped_nsobject<id> delegate_; SEL didEndSelector_; @@ -113,8 +113,8 @@ class ConstrainedWindowMac : public ConstrainedWindow { virtual ~ConstrainedWindowMac(); // Overridden from ConstrainedWindow: - virtual void ShowConstrainedWindow(); - virtual void CloseConstrainedWindow(); + virtual void ShowConstrainedWindow() OVERRIDE; + virtual void CloseConstrainedWindow() OVERRIDE; // Returns the TabContentsWrapper that constrains this Constrained Window. TabContentsWrapper* owner() const { return wrapper_; } diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h index 64648c8..5a67fd2 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h @@ -27,7 +27,7 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegateCustomSheet, void OnSheetDidEnd(NSWindow* sheet); // ConstrainedWindowMacDelegateCustomSheet implementation. - virtual void DeleteDelegate(); + virtual void DeleteDelegate() OVERRIDE; private: virtual ~CollectedCookiesMac(); @@ -35,7 +35,7 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegateCustomSheet, // NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; content::NotificationRegistrar registrar_; diff --git a/chrome/browser/ui/cocoa/download/background_theme.h b/chrome/browser/ui/cocoa/download/background_theme.h index 46091f9..5861b53 100644 --- a/chrome/browser/ui/cocoa/download/background_theme.h +++ b/chrome/browser/ui/cocoa/download/background_theme.h @@ -16,18 +16,19 @@ public: BackgroundTheme(ui::ThemeProvider* provider); virtual ~BackgroundTheme(); - virtual void Init(Profile* profile) {} - virtual SkBitmap* GetBitmapNamed(int id) const; - virtual SkColor GetColor(int id) const; - virtual bool GetDisplayProperty(int id, int* result) const; - virtual bool ShouldUseNativeFrame() const; - virtual bool HasCustomImage(int id) const; - virtual RefCountedMemory* GetRawData(int id) const; - virtual NSImage* GetNSImageNamed(int id, bool allow_default) const; - virtual NSColor* GetNSImageColorNamed(int id, bool allow_default) const; - virtual NSColor* GetNSColor(int id, bool allow_default) const; - virtual NSColor* GetNSColorTint(int id, bool allow_default) const; - virtual NSGradient* GetNSGradient(int id) const; + virtual void Init(Profile* profile) OVERRIDE {} + virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE; + virtual SkColor GetColor(int id) const OVERRIDE; + virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; + virtual bool ShouldUseNativeFrame() const OVERRIDE; + virtual bool HasCustomImage(int id) const OVERRIDE; + virtual RefCountedMemory* GetRawData(int id) const OVERRIDE; + virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE; + virtual NSColor* GetNSImageColorNamed(int id, + bool allow_default) const OVERRIDE; + virtual NSColor* GetNSColor(int id, bool allow_default) const OVERRIDE; + virtual NSColor* GetNSColorTint(int id, bool allow_default) const OVERRIDE; + virtual NSGradient* GetNSGradient(int id) const OVERRIDE; private: ui::ThemeProvider* provider_; diff --git a/chrome/browser/ui/cocoa/download/download_item_mac.h b/chrome/browser/ui/cocoa/download/download_item_mac.h index b68224d..d4abf3b 100644 --- a/chrome/browser/ui/cocoa/download/download_item_mac.h +++ b/chrome/browser/ui/cocoa/download/download_item_mac.h @@ -36,8 +36,8 @@ class DownloadItemMac : DownloadItem::Observer { virtual ~DownloadItemMac(); // DownloadItem::Observer implementation - virtual void OnDownloadUpdated(DownloadItem* download); - virtual void OnDownloadOpened(DownloadItem* download); + virtual void OnDownloadUpdated(DownloadItem* download) OVERRIDE; + virtual void OnDownloadOpened(DownloadItem* download) OVERRIDE; BaseDownloadItemModel* download_model() { return download_model_.get(); } diff --git a/chrome/browser/ui/cocoa/download/download_shelf_mac.h b/chrome/browser/ui/cocoa/download/download_shelf_mac.h index e9de577..37ee541 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_mac.h +++ b/chrome/browser/ui/cocoa/download/download_shelf_mac.h @@ -8,6 +8,7 @@ #import <Cocoa/Cocoa.h> +#include "base/compiler_specific.h" #include "chrome/browser/download/download_shelf.h" class BaseDownloadItemModel; @@ -22,12 +23,12 @@ class DownloadShelfMac : public DownloadShelf { DownloadShelfMac(Browser* browser, DownloadShelfController* controller); // DownloadShelf implementation. - virtual void AddDownload(BaseDownloadItemModel* download_model); - virtual bool IsShowing() const; - virtual bool IsClosing() const; - virtual void Show(); - virtual void Close(); - virtual Browser* browser() const; + virtual void AddDownload(BaseDownloadItemModel* download_model) OVERRIDE; + virtual bool IsShowing() const OVERRIDE; + virtual bool IsClosing() const OVERRIDE; + virtual void Show() OVERRIDE; + virtual void Close() OVERRIDE; + virtual Browser* browser() const OVERRIDE; private: // The browser that owns this shelf. diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h index a88df5d..cc07720 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_COCOA_FIND_BAR_FIND_BAR_BRIDGE_H_ #pragma once +#include "base/compiler_specific.h" #include "base/logging.h" #include "chrome/browser/ui/find_bar/find_bar.h" @@ -44,34 +45,35 @@ class FindBarBridge : public FindBar, return cocoa_controller_; } - virtual void SetFindBarController(FindBarController* find_bar_controller); + virtual void SetFindBarController( + FindBarController* find_bar_controller) OVERRIDE; - virtual FindBarController* GetFindBarController() const; + virtual FindBarController* GetFindBarController() const OVERRIDE; - virtual FindBarTesting* GetFindBarTesting(); + virtual FindBarTesting* GetFindBarTesting() OVERRIDE; // Methods from FindBar. - virtual void Show(bool animate); - virtual void Hide(bool animate); - virtual void SetFocusAndSelection(); - virtual void ClearResults(const FindNotificationDetails& results); - virtual void StopAnimation(); - virtual void SetFindText(const string16& find_text); + virtual void Show(bool animate) OVERRIDE; + virtual void Hide(bool animate) OVERRIDE; + virtual void SetFocusAndSelection() OVERRIDE; + virtual void ClearResults(const FindNotificationDetails& results) OVERRIDE; + virtual void StopAnimation() OVERRIDE; + virtual void SetFindText(const string16& find_text) OVERRIDE; virtual void UpdateUIForFindResult(const FindNotificationDetails& result, - const string16& find_text); - virtual void AudibleAlert(); - virtual bool IsFindBarVisible(); - virtual void RestoreSavedFocus(); + const string16& find_text) OVERRIDE; + virtual void AudibleAlert() OVERRIDE; + virtual bool IsFindBarVisible() OVERRIDE; + virtual void RestoreSavedFocus() OVERRIDE; virtual void MoveWindowIfNecessary(const gfx::Rect& selection_rect, - bool no_redraw); + bool no_redraw) OVERRIDE; // Methods from FindBarTesting. virtual bool GetFindBarWindowInfo(gfx::Point* position, - bool* fully_visible); - virtual string16 GetFindText(); - virtual string16 GetFindSelectedText(); - virtual string16 GetMatchCountText(); - virtual int GetWidth(); + bool* fully_visible) OVERRIDE; + virtual string16 GetFindText() OVERRIDE; + virtual string16 GetFindSelectedText() OVERRIDE; + virtual string16 GetMatchCountText() OVERRIDE; + virtual int GetWidth() OVERRIDE; // Used to disable find bar animations when testing. static bool disable_animations_during_testing_; diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h index dcd3fcc..d4c96c3 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.h +++ b/chrome/browser/ui/cocoa/history_menu_bridge.h @@ -127,15 +127,15 @@ class HistoryMenuBridge : public content::NotificationObserver, // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // TabRestoreServiceObserver: - virtual void TabRestoreServiceChanged(TabRestoreService* service); - virtual void TabRestoreServiceDestroyed(TabRestoreService* service); + virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE; + virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE; // MainMenuItem: - virtual void ResetMenu(); - virtual void BuildMenu(); + virtual void ResetMenu() OVERRIDE; + virtual void BuildMenu() OVERRIDE; // Looks up an NSMenuItem in the |menu_item_map_| and returns the // corresponding HistoryItem. diff --git a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.h b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.h index 073e60f..7bb3c8b 100644 --- a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.h +++ b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.h @@ -26,12 +26,12 @@ class JSModalDialogCocoa : public NativeAppModalDialog { virtual ~JSModalDialogCocoa(); // Overridden from NativeAppModalDialog: - virtual int GetAppModalDialogButtons() const; - virtual void ShowAppModalDialog(); - virtual void ActivateAppModalDialog(); - virtual void CloseAppModalDialog(); - virtual void AcceptAppModalDialog(); - virtual void CancelAppModalDialog(); + virtual int GetAppModalDialogButtons() const OVERRIDE; + virtual void ShowAppModalDialog() OVERRIDE; + virtual void ActivateAppModalDialog() OVERRIDE; + virtual void CloseAppModalDialog() OVERRIDE; + virtual void AcceptAppModalDialog() OVERRIDE; + virtual void CancelAppModalDialog() OVERRIDE; JavaScriptAppModalDialog* dialog() const { return dialog_.get(); } diff --git a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h index 508cbd4..ed867b8 100644 --- a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h @@ -30,8 +30,8 @@ class BubbleDecoration : public LocationBarDecoration { NSColor* text_color); // Implement |LocationBarDecoration|. - virtual void DrawInFrame(NSRect frame, NSView* control_view); - virtual CGFloat GetWidthForSpace(CGFloat width); + virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE; + virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE; protected: // Helper returning bubble width for the given |image| and |label| diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h index 8c3346b..8a1ed6b 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h @@ -31,11 +31,11 @@ class ContentSettingDecoration : public ImageDecoration { bool UpdateFromTabContents(TabContents* tab_contents); // Overridden from |LocationBarDecoration| - virtual bool AcceptsMousePress(); - virtual bool OnMousePressed(NSRect frame); - virtual NSString* GetToolTip(); - virtual CGFloat GetWidthForSpace(CGFloat width); - virtual void DrawInFrame(NSRect frame, NSView* control_view); + virtual bool AcceptsMousePress() OVERRIDE; + virtual bool OnMousePressed(NSRect frame) OVERRIDE; + virtual NSString* GetToolTip() OVERRIDE; + virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE; + virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE; // Called from internal animator. Only public because ObjC objects can't // be friends. diff --git a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h index c0a29aa..a7852da 100644 --- a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -35,13 +35,13 @@ class EVBubbleDecoration : public BubbleDecoration { NSPoint GetBubblePointInFrame(NSRect frame); // Implement |LocationBarDecoration|. - virtual CGFloat GetWidthForSpace(CGFloat width); - virtual bool IsDraggable(); - virtual NSPasteboard* GetDragPasteboard(); - virtual NSImage* GetDragImage(); - virtual NSRect GetDragImageFrame(NSRect frame); - virtual bool OnMousePressed(NSRect frame); - virtual bool AcceptsMousePress(); + virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE; + virtual bool IsDraggable() OVERRIDE; + virtual NSPasteboard* GetDragPasteboard() OVERRIDE; + virtual NSImage* GetDragImage() OVERRIDE; + virtual NSRect GetDragImageFrame(NSRect frame) OVERRIDE; + virtual bool OnMousePressed(NSRect frame) OVERRIDE; + virtual bool AcceptsMousePress() OVERRIDE; private: // Keeps a reference to the font for use when eliding. diff --git a/chrome/browser/ui/cocoa/location_bar/image_decoration.h b/chrome/browser/ui/cocoa/location_bar/image_decoration.h index 889144b..31abdfa 100644 --- a/chrome/browser/ui/cocoa/location_bar/image_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/image_decoration.h @@ -24,8 +24,8 @@ class ImageDecoration : public LocationBarDecoration { NSRect GetDrawRectInFrame(NSRect frame); // Implement |LocationBarDecoration|. - virtual CGFloat GetWidthForSpace(CGFloat width); - virtual void DrawInFrame(NSRect frame, NSView* control_view); + virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE; + virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE; private: scoped_nsobject<NSImage> image_; diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h index 0e4e587..07338a4 100644 --- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h @@ -25,8 +25,8 @@ class KeywordHintDecoration : public LocationBarDecoration { void SetKeyword(const string16& keyword, bool is_extension_keyword); // Implement |LocationBarDecoration|. - virtual void DrawInFrame(NSRect frame, NSView* control_view); - virtual CGFloat GetWidthForSpace(CGFloat width); + virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE; + virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE; private: // Fetch and cache the [tab] image. diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index 53a0210..5af7cd5 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h @@ -126,19 +126,20 @@ class LocationBarViewMac : public AutocompleteEditController, NSRect GetBlockedPopupRect() const; // AutocompleteEditController implementation. - virtual void OnAutocompleteAccept(const GURL& url, + virtual void OnAutocompleteAccept( + const GURL& url, WindowOpenDisposition disposition, content::PageTransition transition, - const GURL& alternate_nav_url); - virtual void OnChanged(); - virtual void OnSelectionBoundsChanged(); - virtual void OnInputInProgress(bool in_progress); - virtual void OnKillFocus(); - virtual void OnSetFocus(); - virtual SkBitmap GetFavicon() const; - virtual string16 GetTitle() const; - virtual InstantController* GetInstant(); - virtual TabContentsWrapper* GetTabContentsWrapper() const; + const GURL& alternate_nav_url) OVERRIDE; + virtual void OnChanged() OVERRIDE; + virtual void OnSelectionBoundsChanged() OVERRIDE; + virtual void OnInputInProgress(bool in_progress) OVERRIDE; + virtual void OnKillFocus() OVERRIDE; + virtual void OnSetFocus() OVERRIDE; + virtual SkBitmap GetFavicon() const OVERRIDE; + virtual string16 GetTitle() const OVERRIDE; + virtual InstantController* GetInstant() OVERRIDE; + virtual TabContentsWrapper* GetTabContentsWrapper() const OVERRIDE; NSImage* GetKeywordImage(const string16& keyword); @@ -148,7 +149,7 @@ class LocationBarViewMac : public AutocompleteEditController, // Overridden from NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; private: // Posts |notification| to the default notification center. diff --git a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h index ef0a1f9..6a88963 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h @@ -21,19 +21,19 @@ class LocationIconDecoration : public ImageDecoration { virtual ~LocationIconDecoration(); // Allow dragging the current URL. - virtual bool IsDraggable(); - virtual NSPasteboard* GetDragPasteboard(); - virtual NSImage* GetDragImage(); - virtual NSRect GetDragImageFrame(NSRect frame); + virtual bool IsDraggable() OVERRIDE; + virtual NSPasteboard* GetDragPasteboard() OVERRIDE; + virtual NSImage* GetDragImage() OVERRIDE; + virtual NSRect GetDragImageFrame(NSRect frame) OVERRIDE; // Get the point where the page info bubble should point within the // decoration's frame, in the |owner_|'s coordinates. NSPoint GetBubblePointInFrame(NSRect frame); // Show the page info panel on click. - virtual bool OnMousePressed(NSRect frame); - virtual bool AcceptsMousePress(); - virtual NSString* GetToolTip(); + virtual bool OnMousePressed(NSRect frame) OVERRIDE; + virtual bool AcceptsMousePress() OVERRIDE; + virtual NSString* GetToolTip() OVERRIDE; private: NSRect drag_frame_; diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h index 8325a60..227bde4 100644 --- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -35,7 +35,7 @@ class PageActionDecoration : public ImageDecoration, // Overridden from |ImageLoadingTracker::Observer|. virtual void OnImageLoaded( - SkBitmap* image, const ExtensionResource& resource, int index); + SkBitmap* image, const ExtensionResource& resource, int index) OVERRIDE; // Called to notify the Page Action that it should determine whether // to be visible or hidden. |contents| is the TabContents that is @@ -51,17 +51,17 @@ class PageActionDecoration : public ImageDecoration, NSPoint GetBubblePointInFrame(NSRect frame); // Overridden from |LocationBarDecoration| - virtual CGFloat GetWidthForSpace(CGFloat width); - virtual bool AcceptsMousePress(); - virtual bool OnMousePressed(NSRect frame); - virtual NSString* GetToolTip(); - virtual NSMenu* GetMenu(); + virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE; + virtual bool AcceptsMousePress() OVERRIDE; + virtual bool OnMousePressed(NSRect frame) OVERRIDE; + virtual NSString* GetToolTip() OVERRIDE; + virtual NSMenu* GetMenu() OVERRIDE; private: // Overridden from NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // The location bar view that owns us. LocationBarViewMac* owner_; diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h index 51cedf4..97dce28 100644 --- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -25,7 +25,7 @@ class SelectedKeywordDecoration : public BubbleDecoration { // Determines what combination of labels and image will best fit // within |width|, makes those current for |BubbleDecoration|, and // return the resulting width. - virtual CGFloat GetWidthForSpace(CGFloat width); + virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE; void SetImage(NSImage* image); diff --git a/chrome/browser/ui/cocoa/location_bar/star_decoration.h b/chrome/browser/ui/cocoa/location_bar/star_decoration.h index 9a25401..55707cf 100644 --- a/chrome/browser/ui/cocoa/location_bar/star_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/star_decoration.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -27,9 +27,9 @@ class StarDecoration : public ImageDecoration { NSPoint GetBubblePointInFrame(NSRect frame); // Implement |LocationBarDecoration|. - virtual bool AcceptsMousePress(); - virtual bool OnMousePressed(NSRect frame); - virtual NSString* GetToolTip(); + virtual bool AcceptsMousePress() OVERRIDE; + virtual bool OnMousePressed(NSRect frame) OVERRIDE; + virtual NSString* GetToolTip() OVERRIDE; private: // For bringing up bookmark bar. diff --git a/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.h b/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.h index 3545280..96d9ca2 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.h +++ b/chrome/browser/ui/cocoa/notifications/balloon_view_bridge.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -22,12 +22,12 @@ class BalloonViewBridge : public BalloonView { virtual ~BalloonViewBridge(); // BalloonView interface. - virtual void Show(Balloon* balloon); - virtual void Update(); - virtual void RepositionToBalloon(); - virtual void Close(bool by_user); - virtual gfx::Size GetSize() const; - virtual BalloonHost* GetHost() const; + virtual void Show(Balloon* balloon) OVERRIDE; + virtual void Update() OVERRIDE; + virtual void RepositionToBalloon() OVERRIDE; + virtual void Close(bool by_user) OVERRIDE; + virtual gfx::Size GetSize() const OVERRIDE; + virtual BalloonHost* GetHost() const OVERRIDE; private: // Weak pointer to the balloon controller which manages the UI. diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h index 3e585ad..bdea0382 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h @@ -44,11 +44,11 @@ class OmniboxPopupViewMac : public AutocompletePopupView, virtual ~OmniboxPopupViewMac(); // Implement the InstantOptInControllerDelegate interface. - virtual void UserPressedOptIn(bool opt_in); + virtual void UserPressedOptIn(bool opt_in) OVERRIDE; // Implement the AutocompletePopupView interface. - virtual bool IsOpen() const; - virtual void InvalidateLine(size_t line) { + virtual bool IsOpen() const OVERRIDE; + virtual void InvalidateLine(size_t line) OVERRIDE { // TODO(shess): Verify that there is no need to implement this. // This is currently used in two places in the model: // @@ -68,18 +68,18 @@ class OmniboxPopupViewMac : public AutocompletePopupView, // may need to move away from NSTableView to implement hover, // though. } - virtual void UpdatePopupAppearance(); + virtual void UpdatePopupAppearance() OVERRIDE; - virtual gfx::Rect GetTargetBounds(); + virtual gfx::Rect GetTargetBounds() OVERRIDE; // Set |line| to be selected. void SetSelectedLine(size_t line); // This is only called by model in SetSelectedLine() after updating // everything. Popup should already be visible. - virtual void PaintUpdatesNow(); + virtual void PaintUpdatesNow() OVERRIDE; - virtual void OnDragCanceled() {} + virtual void OnDragCanceled() OVERRIDE {} // Opens the URL corresponding to the given |row|. If |force_background| is // true, forces the URL to open in a background tab. Otherwise, determines diff --git a/chrome/browser/ui/cocoa/repost_form_warning_mac.h b/chrome/browser/ui/cocoa/repost_form_warning_mac.h index ba04032..700cfd9 100644 --- a/chrome/browser/ui/cocoa/repost_form_warning_mac.h +++ b/chrome/browser/ui/cocoa/repost_form_warning_mac.h @@ -29,7 +29,7 @@ class RepostFormWarningMac : public ConstrainedWindowMacDelegateSystemSheet { TabContents* tab_contents); // ConstrainedWindowDelegateMacSystemSheet methods: - virtual void DeleteDelegate(); + virtual void DeleteDelegate() OVERRIDE; private: virtual ~RepostFormWarningMac(); diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h index 0316e02..f25cc87 100644 --- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h +++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h @@ -33,7 +33,7 @@ class StatusIconMac : public StatusIcon { protected: // Overridden from StatusIcon. - virtual void UpdatePlatformContextMenu(ui::MenuModel* menu); + virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) OVERRIDE; private: // Getter for item_ that allows lazy initialization. diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h b/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h index 029da8e..4e4f9c4 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h @@ -8,6 +8,7 @@ #import <Foundation/Foundation.h> +#include "base/compiler_specific.h" #include "chrome/browser/tabs/tab_strip_model_observer.h" class TabContentsWrapper; @@ -26,27 +27,28 @@ class TabStripModelObserverBridge : public TabStripModelObserver { // Overridden from TabStripModelObserver virtual void TabInsertedAt(TabContentsWrapper* contents, int index, - bool foreground); + bool foreground) OVERRIDE; virtual void TabClosingAt(TabStripModel* tab_strip_model, TabContentsWrapper* contents, - int index); - virtual void TabDetachedAt(TabContentsWrapper* contents, int index); + int index) OVERRIDE; + virtual void TabDetachedAt(TabContentsWrapper* contents, int index) OVERRIDE; virtual void ActiveTabChanged(TabContentsWrapper* old_contents, TabContentsWrapper* new_contents, int index, - bool user_gesture); + bool user_gesture) OVERRIDE; virtual void TabMoved(TabContentsWrapper* contents, int from_index, - int to_index); + int to_index) OVERRIDE; virtual void TabChangedAt(TabContentsWrapper* contents, int index, - TabChangeType change_type); + TabChangeType change_type) OVERRIDE; virtual void TabReplacedAt(TabStripModel* tab_strip_model, TabContentsWrapper* old_contents, TabContentsWrapper* new_contents, - int index); - virtual void TabMiniStateChanged(TabContentsWrapper* contents, int index); - virtual void TabStripEmpty(); - virtual void TabStripModelDeleted(); + int index) OVERRIDE; + virtual void TabMiniStateChanged(TabContentsWrapper* contents, + int index) OVERRIDE; + virtual void TabStripEmpty() OVERRIDE; + virtual void TabStripModelDeleted() OVERRIDE; private: id controller_; // weak, owns me diff --git a/chrome/browser/ui/cocoa/task_manager_mac.h b/chrome/browser/ui/cocoa/task_manager_mac.h index b0518d6..067e14e 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac.h +++ b/chrome/browser/ui/cocoa/task_manager_mac.h @@ -74,18 +74,18 @@ class TaskManagerMac : public TaskManagerModelObserver, virtual ~TaskManagerMac(); // TaskManagerModelObserver - virtual void OnModelChanged(); - virtual void OnItemsChanged(int start, int length); - virtual void OnItemsAdded(int start, int length); - virtual void OnItemsRemoved(int start, int length); + virtual void OnModelChanged() OVERRIDE; + virtual void OnItemsChanged(int start, int length) OVERRIDE; + virtual void OnItemsAdded(int start, int length) OVERRIDE; + virtual void OnItemsRemoved(int start, int length) OVERRIDE; // Called by the cocoa window controller when its window closes and the // controller destroyed itself. Informs the model to stop updating. void WindowWasClosed(); // TableRowNSImageCache::Table - virtual int RowCount() const; - virtual SkBitmap GetIcon(int r) const; + virtual int RowCount() const OVERRIDE; + virtual SkBitmap GetIcon(int r) const OVERRIDE; // Creates the task manager if it doesn't exist; otherwise, it activates the // existing task manager window. Highlights background resources if |