diff options
44 files changed, 169 insertions, 135 deletions
diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm index 65db8ef..3ab6da3 100644 --- a/chrome/app/breakpad_mac.mm +++ b/chrome/app/breakpad_mac.mm @@ -130,7 +130,7 @@ class DumpHelper : public base::PlatformThread::Delegate { private: DumpHelper() {} - virtual void ThreadMain() { + virtual void ThreadMain() OVERRIDE { base::PlatformThread::SetName("CrDumpHelper"); BreakpadGenerateAndSendReport(gBreakpadRef); } diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc index f9891c5..1a52bb1a 100644 --- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc +++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc @@ -100,7 +100,7 @@ class FFDecryptorServerChannelListener : public IPC::Listener { sender_->Send(new Msg_Decryptor_Quit()); } - virtual bool OnMessageReceived(const IPC::Message& msg) { + virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE { bool handled = true; IPC_BEGIN_MESSAGE_MAP(FFDecryptorServerChannelListener, msg) IPC_MESSAGE_HANDLER(Msg_Decryptor_InitReturnCode, OnInitDecryptorResponse) @@ -111,7 +111,7 @@ class FFDecryptorServerChannelListener : public IPC::Listener { } // If an error occured, just kill the message Loop. - virtual void OnChannelError() { + virtual void OnChannelError() OVERRIDE { got_result = false; MessageLoop::current()->Quit(); } @@ -244,7 +244,7 @@ class FFDecryptorClientChannelListener : public IPC::Listener { MessageLoop::current()->Quit(); } - virtual bool OnMessageReceived(const IPC::Message& msg) { + virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE { bool handled = true; IPC_BEGIN_MESSAGE_MAP(FFDecryptorClientChannelListener, msg) IPC_MESSAGE_HANDLER(Msg_Decryptor_Init, OnDecryptor_Init) @@ -255,7 +255,7 @@ class FFDecryptorClientChannelListener : public IPC::Listener { return handled; } - virtual void OnChannelError() { + virtual void OnChannelError() OVERRIDE { MessageLoop::current()->Quit(); } diff --git a/chrome/browser/speech/tts_mac.mm b/chrome/browser/speech/tts_mac.mm index b5683a1..44f5ed3 100644 --- a/chrome/browser/speech/tts_mac.mm +++ b/chrome/browser/speech/tts_mac.mm @@ -27,7 +27,7 @@ class TtsPlatformImplMac; class TtsPlatformImplMac : public TtsPlatformImpl { public: - virtual bool PlatformImplAvailable() { + virtual bool PlatformImplAvailable() OVERRIDE { return true; } @@ -35,13 +35,13 @@ class TtsPlatformImplMac : public TtsPlatformImpl { int utterance_id, const std::string& utterance, const std::string& lang, - const UtteranceContinuousParameters& params); + const UtteranceContinuousParameters& params) OVERRIDE; - virtual bool StopSpeaking(); + virtual bool StopSpeaking() OVERRIDE; - virtual bool IsSpeaking(); + virtual bool IsSpeaking() OVERRIDE; - virtual bool SendsEvent(TtsEventType event_type); + virtual bool SendsEvent(TtsEventType event_type) OVERRIDE; // Called by ChromeTtsDelegate when we get a callback from the // native speech engine. diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc b/chrome/browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc index 39658a0..25a83ad 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc +++ b/chrome/browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc @@ -21,7 +21,7 @@ class TestingSpellCheckMessageFilter : public SpellCheckMessageFilterMac { : SpellCheckMessageFilterMac(), loop_(loop) { } - virtual bool Send(IPC::Message* message) { + virtual bool Send(IPC::Message* message) OVERRIDE { sent_messages_.push_back(message); loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure()); return true; @@ -31,7 +31,7 @@ class TestingSpellCheckMessageFilter : public SpellCheckMessageFilterMac { MessageLoopForUI* loop_; private: - ~TestingSpellCheckMessageFilter() { + virtual ~TestingSpellCheckMessageFilter() { STLDeleteContainerPointers(sent_messages_.begin(), sent_messages_.end()); } }; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index 3b66093..ddefd62 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -205,29 +205,35 @@ class FakeTheme : public ui::ThemeProvider { FakeTheme(NSColor* color) : color_(color) {} scoped_nsobject<NSColor> color_; - virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const { return NULL; } - virtual SkColor GetColor(int id) const { return SkColor(); } - virtual bool GetDisplayProperty(int id, int* result) const { return false; } - virtual bool ShouldUseNativeFrame() const { return false; } - virtual bool HasCustomImage(int id) const { return false; } + virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE { + return NULL; + } + virtual SkColor GetColor(int id) const OVERRIDE { return SkColor(); } + virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE { + return false; + } + virtual bool ShouldUseNativeFrame() const OVERRIDE { return false; } + virtual bool HasCustomImage(int id) const OVERRIDE { return false; } virtual base::RefCountedMemory* GetRawData( int id, - ui::ScaleFactor scale_factor) const { + ui::ScaleFactor scale_factor) const OVERRIDE { return NULL; } - virtual NSImage* GetNSImageNamed(int id, bool allow_default) const { + virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE { return nil; } - virtual NSColor* GetNSImageColorNamed(int id, bool allow_default) const { + virtual NSColor* GetNSImageColorNamed( + int id, + bool allow_default) const OVERRIDE { return nil; } - virtual NSColor* GetNSColor(int id, bool allow_default) const { + virtual NSColor* GetNSColor(int id, bool allow_default) const OVERRIDE { return color_.get(); } - virtual NSColor* GetNSColorTint(int id, bool allow_default) const { + virtual NSColor* GetNSColorTint(int id, bool allow_default) const OVERRIDE { return nil; } - virtual NSGradient* GetNSGradient(int id) const { + virtual NSGradient* GetNSGradient(int id) const OVERRIDE { return nil; } }; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm index 50405b4..f9d4dcf 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm @@ -454,7 +454,7 @@ TEST_F(BookmarkEditorControllerTreeTest, AddFolderWithFolderSelected) { class BookmarkEditorControllerTreeNoNodeTest : public BookmarkEditorControllerTreeTest { public: - virtual BookmarkEditorController* CreateController() { + virtual BookmarkEditorController* CreateController() OVERRIDE { return [[BookmarkEditorController alloc] initWithParentWindow:test_window() profile:profile() diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm index b777c2f..9b57ca5 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm @@ -32,7 +32,7 @@ class TestBookmarkMenuBridge : public BookmarkMenuBridge { protected: // Overridden from BookmarkMenuBridge. - virtual NSMenu* BookmarkMenu() { + virtual NSMenu* BookmarkMenu() OVERRIDE { return menu_; } }; diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm index 4dd0be9..fdba717 100644 --- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm @@ -66,7 +66,7 @@ const int kSystemSheetReturnCode = 77; class ConstrainedWindowSheetControllerTest : public CocoaTest { protected: - ~ConstrainedWindowSheetControllerTest() { + virtual ~ConstrainedWindowSheetControllerTest() { } virtual void SetUp() OVERRIDE { diff --git a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm index 14305d1..901a7559 100644 --- a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm +++ b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm @@ -65,9 +65,10 @@ class DownloadAnimationWebObserver : public content::NotificationObserver { // Runs when a tab is hidden or destroyed. Let our owner know we should end // the animation. - void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) { + virtual void Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE { if (type == content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED) { bool visible = *content::Details<bool>(details).ptr(); if (visible) diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm index 86e62aa..a9d9984 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm @@ -60,14 +60,15 @@ class ExtensionActionIconFactoryBridge virtual ~ExtensionActionIconFactoryBridge() {} // ExtensionActionIconFactory::Observer implementation. - void OnIconUpdated() OVERRIDE { + virtual void OnIconUpdated() OVERRIDE { [owner_ updateState]; } // Overridden from content::NotificationObserver. - void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) { + virtual void Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE { if (type == chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED) [owner_ updateState]; else diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm index aa06434..6ccb99c 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm @@ -188,9 +188,10 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver, } // Overridden from content::NotificationObserver. - void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) { + virtual void Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE { switch (type) { case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: { ExtensionPopupController* popup = [ExtensionPopupController popup]; @@ -226,12 +227,14 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver, } // ExtensionToolbarModel::Observer implementation. - void BrowserActionAdded(const Extension* extension, int index) { + virtual void BrowserActionAdded( + const Extension* extension, + int index) OVERRIDE { [owner_ createActionButtonForExtension:extension withIndex:index]; [owner_ resizeContainerAndAnimate:NO]; } - void BrowserActionRemoved(const Extension* extension) { + virtual void BrowserActionRemoved(const Extension* extension) OVERRIDE { [owner_ removeActionButtonForExtension:extension]; [owner_ resizeContainerAndAnimate:NO]; } diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm index de496c2..4de7d5e 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -59,14 +59,14 @@ class AsyncUninstaller : public ExtensionUninstallDialog::Delegate { extension_uninstall_dialog_->ConfirmUninstall(extension_); } - ~AsyncUninstaller() {} + virtual ~AsyncUninstaller() {} // ExtensionUninstallDialog::Delegate: - virtual void ExtensionUninstallAccepted() { + virtual void ExtensionUninstallAccepted() OVERRIDE { extensions::ExtensionSystem::Get(profile_)->extension_service()-> UninstallExtension(extension_->id(), false, NULL); } - virtual void ExtensionUninstallCanceled() {} + virtual void ExtensionUninstallCanceled() OVERRIDE {} private: // The extension that we're loading the icon for. Weak. diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm index 73e0af3..94701dc 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm @@ -67,9 +67,10 @@ class ExtensionLoadedNotificationObserver private: // NotificationObserver implementation. Tells the controller to start showing // its window on the main thread when the extension has finished loading. - void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) { + virtual void Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE { if (type == chrome::NOTIFICATION_EXTENSION_LOADED) { const Extension* extension = content::Details<const Extension>(details).ptr(); diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm index 12d24a604d..cd7ad10 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm @@ -83,9 +83,10 @@ class DevtoolsNotificationBridge : public content::NotificationObserver { explicit DevtoolsNotificationBridge(ExtensionPopupController* controller) : controller_(controller) {} - void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) { + virtual void Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE { switch (type) { case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: { if (content::Details<extensions::ExtensionHost>( diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm index ae2cf70..c0a2646 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm @@ -36,7 +36,7 @@ class MockBridge : public HistoryMenuBridge { : HistoryMenuBridge(profile), menu_([[NSMenu alloc] initWithTitle:@"History"]) {} - virtual NSMenu* HistoryMenu() { + virtual NSMenu* HistoryMenu() OVERRIDE { return menu_.get(); } diff --git a/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm b/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm index a64876e..18e78b7 100644 --- a/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm @@ -14,7 +14,7 @@ class HistoryOverlayControllerTest : public CocoaTest { public: - void SetUp() { + virtual void SetUp() { CocoaTest::SetUp(); // The overlay controller shows the panel in the superview of a given diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm index c0c2651..31bcc3c 100644 --- a/chrome/browser/ui/cocoa/info_bubble_window.mm +++ b/chrome/browser/ui/cocoa/info_bubble_window.mm @@ -38,9 +38,10 @@ class AppNotificationBridge : public content::NotificationObserver { } // Overridden from content::NotificationObserver. - void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) { + virtual void Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE { switch (type) { case chrome::NOTIFICATION_APP_TERMINATING: [owner_ appIsTerminating]; diff --git a/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm b/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm index 9d3fae5..37c90fe 100644 --- a/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm @@ -117,7 +117,7 @@ class ConfirmInfoBarControllerTest : public CocoaProfileTest, bool closed_delegate_link_clicked_; private: - virtual void OnInfoBarDelegateClosed() { + virtual void OnInfoBarDelegateClosed() OVERRIDE { closed_delegate_ok_clicked_ = delegate_->ok_clicked(); closed_delegate_cancel_clicked_ = delegate_->cancel_clicked(); closed_delegate_link_clicked_ = delegate_->link_clicked(); diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm index 7bac763..1073c3d 100644 --- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm @@ -118,7 +118,7 @@ class InfobarBridge : public ExtensionInfoBarDelegate::DelegateObserver { } // Overridden from ExtensionInfoBarDelegate::DelegateObserver: - virtual void OnDelegateDeleted() { + virtual void OnDelegateDeleted() OVERRIDE { delegate_ = NULL; } diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm index 1889bb8..043a254 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm @@ -28,9 +28,10 @@ class InfoBarNotificationObserver : public content::NotificationObserver { private: // NotificationObserver implementation - void Observe(int type, - const content::NotificationSource& source, - const content::NotificationDetails& details) { + virtual void Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE { InfoBarService* infobar_service = content::Source<InfoBarService>(source).ptr(); switch (type) { diff --git a/chrome/browser/ui/cocoa/menu_controller_unittest.mm b/chrome/browser/ui/cocoa/menu_controller_unittest.mm index 035f92b..efca488 100644 --- a/chrome/browser/ui/cocoa/menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/menu_controller_unittest.mm @@ -33,17 +33,19 @@ class Delegate : public ui::SimpleMenuModel::Delegate { did_close_(false) { } - virtual bool IsCommandIdChecked(int command_id) const { return false; } - virtual bool IsCommandIdEnabled(int command_id) const { + virtual bool IsCommandIdChecked(int command_id) const OVERRIDE { + return false; + } + virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE { ++enable_count_; return true; } virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) { return false; } - virtual void ExecuteCommand(int command_id) { ++execute_count_; } + ui::Accelerator* accelerator) OVERRIDE { return false; } + virtual void ExecuteCommand(int command_id) OVERRIDE { ++execute_count_; } - virtual void MenuWillShow(ui::SimpleMenuModel* /*source*/) { + virtual void MenuWillShow(ui::SimpleMenuModel* /*source*/) OVERRIDE { EXPECT_FALSE(did_show_); EXPECT_FALSE(did_close_); did_show_ = true; @@ -56,7 +58,7 @@ class Delegate : public ui::SimpleMenuModel::Delegate { inModes:modes]; } - virtual void MenuClosed(ui::SimpleMenuModel* /*source*/) { + virtual void MenuClosed(ui::SimpleMenuModel* /*source*/) OVERRIDE { EXPECT_TRUE(did_show_); EXPECT_FALSE(did_close_); did_close_ = true; @@ -76,9 +78,15 @@ class Delegate : public ui::SimpleMenuModel::Delegate { class DynamicDelegate : public Delegate { public: DynamicDelegate() {} - virtual bool IsItemForCommandIdDynamic(int command_id) const { return true; } - virtual string16 GetLabelForCommandId(int command_id) const { return label_; } - virtual bool GetIconForCommandId(int command_id, gfx::Image* icon) const { + virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE { + return true; + } + virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE { + return label_; + } + virtual bool GetIconForCommandId( + int command_id, + gfx::Image* icon) const OVERRIDE { if (icon_.IsEmpty()) { return false; } else { diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm index 0a17ceb..bebfe5f 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller_unittest.mm @@ -33,18 +33,23 @@ namespace { // Use a dummy balloon collection for testing. class MockBalloonCollection : public BalloonCollection { virtual void Add(const Notification& notification, - Profile* profile) {} - virtual bool DoesIdExist(const std::string& id) { return false; } - virtual bool RemoveById(const std::string& id) { return false; } - virtual bool RemoveBySourceOrigin(const GURL& origin) { return false; } - virtual bool RemoveByProfile(Profile* profile) { return false; } - virtual void RemoveAll() {} - virtual bool HasSpace() const { return true; } - virtual void ResizeBalloon(Balloon* balloon, const gfx::Size& size) {} - virtual void DisplayChanged() {} - virtual void SetPositionPreference(PositionPreference preference) {} - virtual void OnBalloonClosed(Balloon* source) {}; - virtual const Balloons& GetActiveBalloons() { + Profile* profile) OVERRIDE {} + virtual bool DoesIdExist(const std::string& id) OVERRIDE { return false; } + virtual bool RemoveById(const std::string& id) OVERRIDE { return false; } + virtual bool RemoveBySourceOrigin(const GURL& origin) OVERRIDE { + return false; + } + virtual bool RemoveByProfile(Profile* profile) OVERRIDE { return false; } + virtual void RemoveAll() OVERRIDE {} + virtual bool HasSpace() const OVERRIDE { return true; } + virtual void ResizeBalloon( + Balloon* balloon, + const gfx::Size& size) OVERRIDE { + } + virtual void DisplayChanged() OVERRIDE {} + virtual void SetPositionPreference(PositionPreference preference) OVERRIDE {} + virtual void OnBalloonClosed(Balloon* source) OVERRIDE {}; + virtual const Balloons& GetActiveBalloons() OVERRIDE { NOTREACHED(); return balloons_; } diff --git a/chrome/browser/ui/cocoa/profile_menu_controller.mm b/chrome/browser/ui/cocoa/profile_menu_controller.mm index 5446f5e..d37e331 100644 --- a/chrome/browser/ui/cocoa/profile_menu_controller.mm +++ b/chrome/browser/ui/cocoa/profile_menu_controller.mm @@ -35,21 +35,21 @@ class Observer : public chrome::BrowserListObserver, BrowserList::AddObserver(this); } - ~Observer() { + virtual ~Observer() { BrowserList::RemoveObserver(this); } // chrome::BrowserListObserver: - virtual void OnBrowserAdded(Browser* browser) {} - virtual void OnBrowserRemoved(Browser* browser) { + virtual void OnBrowserAdded(Browser* browser) OVERRIDE {} + virtual void OnBrowserRemoved(Browser* browser) OVERRIDE { [controller_ activeBrowserChangedTo:chrome::GetLastActiveBrowser()]; } - virtual void OnBrowserSetLastActive(Browser* browser) { + virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE { [controller_ activeBrowserChangedTo:browser]; } // AvatarMenuModelObserver: - virtual void OnAvatarMenuModelChanged(AvatarMenuModel* model) { + virtual void OnAvatarMenuModelChanged(AvatarMenuModel* model) OVERRIDE { [controller_ rebuildMenu]; } diff --git a/chrome/browser/ui/cocoa/speech_recognition_bubble_cocoa.mm b/chrome/browser/ui/cocoa/speech_recognition_bubble_cocoa.mm index 0950433..eb48acb 100644 --- a/chrome/browser/ui/cocoa/speech_recognition_bubble_cocoa.mm +++ b/chrome/browser/ui/cocoa/speech_recognition_bubble_cocoa.mm @@ -29,10 +29,10 @@ class SpeechRecognitionBubbleImpl : public SpeechRecognitionBubbleBase { Delegate* delegate, const gfx::Rect& element_rect); virtual ~SpeechRecognitionBubbleImpl(); - virtual void Show(); - virtual void Hide(); - virtual void UpdateLayout(); - virtual void UpdateImage(); + virtual void Show() OVERRIDE; + virtual void Hide() OVERRIDE; + virtual void UpdateLayout() OVERRIDE; + virtual void UpdateImage() OVERRIDE; private: scoped_nsobject<SpeechRecognitionWindowController> window_; diff --git a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm index 1b997ce..ae99915 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm @@ -71,9 +71,12 @@ class StatusBubbleMacIgnoreMouseMoved : public StatusBubbleMac { mouseLocation_.SetPoint(NSMaxX(contentBounds), NSMaxY(contentBounds)); } - virtual void MouseMoved(const gfx::Point& location, bool left_content) {} + virtual void MouseMoved( + const gfx::Point& location, + bool left_content) OVERRIDE { + } - virtual gfx::Point GetMouseLocation() { + virtual gfx::Point GetMouseLocation() OVERRIDE { return mouseLocation_; } diff --git a/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm b/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm index c2e37ae..fb1fcc2 100644 --- a/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm +++ b/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm @@ -18,10 +18,10 @@ class TestTable : public TableRowNSImageCache::Table { } // TableRowNSImageCache::Table overrides. - virtual int RowCount() const { + virtual int RowCount() const OVERRIDE { return rows_.size(); } - virtual gfx::ImageSkia GetIcon(int index) const { + virtual gfx::ImageSkia GetIcon(int index) const OVERRIDE { return gfx::ImageSkia::CreateFrom1xBitmap(rows_[index]); } diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_controller.mm index 8b3dd2c..dddf4333 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm @@ -42,16 +42,18 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate { owner_(owner) {} // Overridden from ui::SimpleMenuModel::Delegate - virtual bool IsCommandIdChecked(int command_id) const { return false; } - virtual bool IsCommandIdEnabled(int command_id) const { + virtual bool IsCommandIdChecked(int command_id) const OVERRIDE { + return false; + } + virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE { TabStripModel::ContextMenuCommand command = static_cast<TabStripModel::ContextMenuCommand>(command_id); return [target_ isCommandEnabled:command forController:owner_]; } virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator) { return false; } - virtual void ExecuteCommand(int command_id) { + ui::Accelerator* accelerator) OVERRIDE { return false; } + virtual void ExecuteCommand(int command_id) OVERRIDE { TabStripModel::ContextMenuCommand command = static_cast<TabStripModel::ContextMenuCommand>(command_id); [target_ commandDispatch:command forController:owner_]; diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm index 45f2c91..3181020 100644 --- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm +++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm @@ -58,9 +58,10 @@ public: virtual bool ShouldShowDialogTitle() const OVERRIDE { return true; } // WebDialogWebContentsDelegate declarations. - virtual void MoveContents(WebContents* source, const gfx::Rect& pos); - virtual void HandleKeyboardEvent(content::WebContents* source, - const NativeWebKeyboardEvent& event); + virtual void MoveContents(WebContents* source, const gfx::Rect& pos) OVERRIDE; + virtual void HandleKeyboardEvent( + content::WebContents* source, + const NativeWebKeyboardEvent& event) OVERRIDE; virtual void CloseContents(WebContents* source) OVERRIDE; virtual content::WebContents* OpenURLFromTab( content::WebContents* source, diff --git a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm index ed8fdb7..76da79c 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm @@ -14,7 +14,7 @@ class MenuTrackedRootViewTest : public CocoaTest { public: - void SetUp() { + virtual void SetUp() { CocoaTest::SetUp(); view_.reset([[MenuTrackedRootView alloc] init]); } diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm index ae57132..52791e2 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm @@ -21,7 +21,7 @@ namespace { class WrenchMenuButtonCellTest : public CocoaTest { public: - void SetUp() { + virtual void SetUp() { CocoaTest::SetUp(); NSRect frame = NSMakeRect(10, 10, 50, 19); diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm index 8f1cc87..e724414 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm @@ -48,7 +48,7 @@ namespace WrenchMenuControllerInternal { class AcceleratorDelegate : public ui::AcceleratorProvider { public: virtual bool GetAcceleratorForCommandId(int command_id, - ui::Accelerator* out_accelerator) { + ui::Accelerator* out_accelerator) OVERRIDE { AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance(); const ui::Accelerator* accelerator = keymap->GetAcceleratorForCommand(command_id); diff --git a/chrome/common/multi_process_lock_mac.cc b/chrome/common/multi_process_lock_mac.cc index 8a05b94..4bceb7b 100644 --- a/chrome/common/multi_process_lock_mac.cc +++ b/chrome/common/multi_process_lock_mac.cc @@ -20,7 +20,7 @@ class MultiProcessLockMac : public MultiProcessLock { } } - virtual bool TryLock() { + virtual bool TryLock() OVERRIDE { if (port_ != NULL) { DLOG(ERROR) << "MultiProcessLock is already locked - " << name_; return true; @@ -38,7 +38,7 @@ class MultiProcessLockMac : public MultiProcessLock { return port_ != NULL; } - virtual void Unlock() { + virtual void Unlock() OVERRIDE { if (port_ == NULL) { DLOG(ERROR) << "Over-unlocked MultiProcessLock - " << name_; return; diff --git a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm index 3d22dd4..f552984 100644 --- a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm +++ b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm @@ -55,7 +55,7 @@ class CoreWlanApi : public WifiDataProviderCommon::WlanApiInterface { bool Init(); // WlanApiInterface - virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data); + virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) OVERRIDE; private: scoped_nsobject<NSBundle> bundle_; diff --git a/content/browser/geolocation/wifi_data_provider_mac.cc b/content/browser/geolocation/wifi_data_provider_mac.cc index 561a309..c72950e 100644 --- a/content/browser/geolocation/wifi_data_provider_mac.cc +++ b/content/browser/geolocation/wifi_data_provider_mac.cc @@ -37,7 +37,7 @@ class Apple80211Api : public WifiDataProviderCommon::WlanApiInterface { bool Init(); // WlanApiInterface - virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data); + virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) OVERRIDE; private: // Handle, context and function pointers for Apple80211 library. diff --git a/content/browser/mach_broker_mac.cc b/content/browser/mach_broker_mac.cc index 5662449..466c84d 100644 --- a/content/browser/mach_broker_mac.cc +++ b/content/browser/mach_broker_mac.cc @@ -43,7 +43,7 @@ class MachListenerThreadDelegate : public base::PlatformThread::Delegate { } // Implement |PlatformThread::Delegate|. - void ThreadMain() { + virtual void ThreadMain() OVERRIDE { base::MachReceiveMessage message; kern_return_t err; while ((err = receive_port_->WaitForMessage(&message, diff --git a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm index a66af96..c81681a 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm @@ -82,7 +82,7 @@ class RenderWidgetHostEditCommandCounter : public RenderWidgetHostImpl { edit_command_message_count_(0) { } - virtual bool Send(IPC::Message* message) { + virtual bool Send(IPC::Message* message) OVERRIDE { if (message->type() == ViewMsg_ExecuteEditCommand::ID) edit_command_message_count_++; return RenderWidgetHostImpl::Send(message); diff --git a/content/common/sandbox_mac_fontloading_unittest.mm b/content/common/sandbox_mac_fontloading_unittest.mm index 30ac477..1c16683 100644 --- a/content/common/sandbox_mac_fontloading_unittest.mm +++ b/content/common/sandbox_mac_fontloading_unittest.mm @@ -19,8 +19,8 @@ namespace content { class FontLoadingTestCase : public MacSandboxTestCase { public: FontLoadingTestCase() : font_data_length_(-1) {} - virtual bool BeforeSandboxInit(); - virtual bool SandboxedTest(); + virtual bool BeforeSandboxInit() OVERRIDE; + virtual bool SandboxedTest() OVERRIDE; private: scoped_ptr<base::SharedMemory> font_shmem_; size_t font_data_length_; diff --git a/content/common/sandbox_mac_system_access_unittest.mm b/content/common/sandbox_mac_system_access_unittest.mm index c216786..6eb681a 100644 --- a/content/common/sandbox_mac_system_access_unittest.mm +++ b/content/common/sandbox_mac_system_access_unittest.mm @@ -20,9 +20,9 @@ class MacSandboxedClipboardTestCase : public MacSandboxTestCase { MacSandboxedClipboardTestCase(); virtual ~MacSandboxedClipboardTestCase(); - virtual bool SandboxedTest(); + virtual bool SandboxedTest() OVERRIDE; - virtual void SetTestData(const char* test_data); + virtual void SetTestData(const char* test_data) OVERRIDE; private: NSString* clipboard_name_; }; @@ -79,7 +79,7 @@ TEST_F(MacSandboxTest, ClipboardAccess) { // Test case for checking sandboxing of filesystem apis. class MacSandboxedFileAccessTestCase : public MacSandboxTestCase { public: - virtual bool SandboxedTest(); + virtual bool SandboxedTest() OVERRIDE; }; REGISTER_SANDBOX_TEST_CASE(MacSandboxedFileAccessTestCase); @@ -98,7 +98,7 @@ TEST_F(MacSandboxTest, FileAccess) { // /dev/urandom is available to ppapi sandbox only. class MacSandboxedUrandomTestCase : public MacSandboxTestCase { public: - virtual bool SandboxedTest(); + virtual bool SandboxedTest() OVERRIDE; }; REGISTER_SANDBOX_TEST_CASE(MacSandboxedUrandomTestCase); diff --git a/content/renderer/external_popup_menu_browsertest.cc b/content/renderer/external_popup_menu_browsertest.cc index c271e09..56810d9 100644 --- a/content/renderer/external_popup_menu_browsertest.cc +++ b/content/renderer/external_popup_menu_browsertest.cc @@ -128,7 +128,7 @@ class ExternalPopupMenuRemoveTest : public ExternalPopupMenuTest { ExternalPopupMenuRemoveTest() {} protected: - virtual bool ShouldRemoveSelectOnChange() const { return true; } + virtual bool ShouldRemoveSelectOnChange() const OVERRIDE { return true; } }; // Tests that nothing bad happen when the page removes the select when it diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc index e8ef33d..8e5dbc3 100644 --- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc +++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc @@ -75,7 +75,7 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback { // AudioInputStream::AudioInputCallback implementation. virtual void OnData(AudioInputStream* stream, const uint8* src, uint32 size, - uint32 hardware_delay_bytes, double volume) { + uint32 hardware_delay_bytes, double volume) OVERRIDE { // Store data data in a temporary buffer to avoid making blocking // fwrite() calls in the audio callback. The complete buffer will be // written to file in the destructor. @@ -84,8 +84,8 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback { } } - virtual void OnClose(AudioInputStream* stream) {} - virtual void OnError(AudioInputStream* stream, int code) {} + virtual void OnClose(AudioInputStream* stream) OVERRIDE {} + virtual void OnError(AudioInputStream* stream, int code) OVERRIDE {} private: media::SeekableBuffer buffer_; diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc index 1c4d59d..c1313d1 100644 --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc @@ -193,7 +193,7 @@ class FinancialPingUrlFetcherDelegate : public net::URLFetcherDelegate { FinancialPingUrlFetcherDelegate(const base::Closure& callback) : callback_(callback) { } - virtual void OnURLFetchComplete(const net::URLFetcher* source); + virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE; private: base::Closure callback_; diff --git a/ui/gfx/image/image_mac_unittest.mm b/ui/gfx/image/image_mac_unittest.mm index fd38d52..7a0c3eb 100644 --- a/ui/gfx/image/image_mac_unittest.mm +++ b/ui/gfx/image/image_mac_unittest.mm @@ -78,7 +78,7 @@ class ImageMacTest : public testing::Test { : supported_scale_factors_(gfx::test::Get1xAnd2xScaleFactors()) { } - ~ImageMacTest() { + virtual ~ImageMacTest() { } private: diff --git a/ui/shell_dialogs/select_file_dialog_mac.mm b/ui/shell_dialogs/select_file_dialog_mac.mm index 6a0e838..31d7cade 100644 --- a/ui/shell_dialogs/select_file_dialog_mac.mm +++ b/ui/shell_dialogs/select_file_dialog_mac.mm @@ -65,8 +65,8 @@ class SelectFileDialogImpl : public ui::SelectFileDialog { ui::SelectFilePolicy* policy); // BaseShellDialog implementation. - virtual bool IsRunning(gfx::NativeWindow parent_window) const; - virtual void ListenerDestroyed(); + virtual bool IsRunning(gfx::NativeWindow parent_window) const OVERRIDE; + virtual void ListenerDestroyed() OVERRIDE; // Callback from ObjC bridge. void FileWasSelected(NSSavePanel* dialog, @@ -98,7 +98,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog { NSView* GetAccessoryView(const FileTypeInfo* file_types, int file_type_index); - virtual bool HasMultipleFileTypeChoicesImpl(); + virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE; // The bridge for results from Cocoa to return to us. scoped_nsobject<SelectFileDialogBridge> bridge_; diff --git a/ui/surface/io_surface_support_mac.cc b/ui/surface/io_surface_support_mac.cc index 49cc285..53376e5 100644 --- a/ui/surface/io_surface_support_mac.cc +++ b/ui/surface/io_surface_support_mac.cc @@ -34,19 +34,19 @@ class IOSurfaceSupportImpl : public IOSurfaceSupport { return initialized_successfully_; } - virtual CFStringRef GetKIOSurfaceWidth(); - virtual CFStringRef GetKIOSurfaceHeight(); - virtual CFStringRef GetKIOSurfaceBytesPerElement(); - virtual CFStringRef GetKIOSurfaceIsGlobal(); + virtual CFStringRef GetKIOSurfaceWidth() OVERRIDE; + virtual CFStringRef GetKIOSurfaceHeight() OVERRIDE; + virtual CFStringRef GetKIOSurfaceBytesPerElement() OVERRIDE; + virtual CFStringRef GetKIOSurfaceIsGlobal() OVERRIDE; - virtual CFTypeRef IOSurfaceCreate(CFDictionaryRef properties); - virtual uint32 IOSurfaceGetID(CFTypeRef io_surface); - virtual CFTypeRef IOSurfaceLookup(uint32 io_surface_id); - virtual mach_port_t IOSurfaceCreateMachPort(CFTypeRef io_surface); - virtual CFTypeRef IOSurfaceLookupFromMachPort(mach_port_t port); + virtual CFTypeRef IOSurfaceCreate(CFDictionaryRef properties) OVERRIDE; + virtual uint32 IOSurfaceGetID(CFTypeRef io_surface) OVERRIDE; + virtual CFTypeRef IOSurfaceLookup(uint32 io_surface_id) OVERRIDE; + virtual mach_port_t IOSurfaceCreateMachPort(CFTypeRef io_surface) OVERRIDE; + virtual CFTypeRef IOSurfaceLookupFromMachPort(mach_port_t port) OVERRIDE; - virtual size_t IOSurfaceGetWidth(CFTypeRef io_surface); - virtual size_t IOSurfaceGetHeight(CFTypeRef io_surface); + virtual size_t IOSurfaceGetWidth(CFTypeRef io_surface) OVERRIDE; + virtual size_t IOSurfaceGetHeight(CFTypeRef io_surface) OVERRIDE; virtual CGLError CGLTexImageIOSurface2D(CGLContextObj ctx, GLenum target, @@ -56,14 +56,14 @@ class IOSurfaceSupportImpl : public IOSurfaceSupport { GLenum format, GLenum type, CFTypeRef io_surface, - GLuint plane); + GLuint plane) OVERRIDE; virtual CFTypeRef CVPixelBufferGetIOSurface( CVPixelBufferRef pixel_buffer) OVERRIDE; private: IOSurfaceSupportImpl(); - ~IOSurfaceSupportImpl(); + virtual ~IOSurfaceSupportImpl(); void CloseLibraryHandles(); |