diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 10:31:45 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 10:31:45 +0000 |
commit | 9b85c922c1ad1c842c99d7874aeea085777b9903 (patch) | |
tree | cb3ace0385cd45c5144feb65902b0211c0172ed8 | |
parent | ec281641c596400842c4bfb8db04645de22838cc (diff) | |
download | chromium_src-9b85c922c1ad1c842c99d7874aeea085777b9903.zip chromium_src-9b85c922c1ad1c842c99d7874aeea085777b9903.tar.gz chromium_src-9b85c922c1ad1c842c99d7874aeea085777b9903.tar.bz2 |
Linux/ChromeOS Chromium style checker cleanup, misc edition.
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
TBR=brettw, satorux
Review URL: https://chromiumcodereview.appspot.com/12253025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183461 0039d316-1c4b-4281-b951-d872f2087c98
28 files changed, 90 insertions, 82 deletions
diff --git a/chrome/browser/autofill/autocheckout/whitelist_manager_unittest.cc b/chrome/browser/autofill/autocheckout/whitelist_manager_unittest.cc index 32d96b3..c940efd 100644 --- a/chrome/browser/autofill/autocheckout/whitelist_manager_unittest.cc +++ b/chrome/browser/autofill/autocheckout/whitelist_manager_unittest.cc @@ -37,12 +37,12 @@ class TestWhitelistManager : public WhitelistManager { : WhitelistManager(context_getter), did_start_download_timer_(false) {} - void ScheduleDownload(size_t interval_seconds) OVERRIDE { + virtual void ScheduleDownload(size_t interval_seconds) OVERRIDE { did_start_download_timer_ = false; return WhitelistManager::ScheduleDownload(interval_seconds); } - void StartDownloadTimer(size_t interval_seconds) OVERRIDE { + virtual void StartDownloadTimer(size_t interval_seconds) OVERRIDE { WhitelistManager::StartDownloadTimer(interval_seconds); did_start_download_timer_ = true; } diff --git a/chrome/browser/instant/instant_overlay.cc b/chrome/browser/instant/instant_overlay.cc index 6b41c38..687b1f6 100644 --- a/chrome/browser/instant/instant_overlay.cc +++ b/chrome/browser/instant/instant_overlay.cc @@ -21,7 +21,7 @@ class InstantOverlayUserData : public base::SupportsUserData::Data { virtual InstantOverlay* overlay() const { return overlay_; } private: - ~InstantOverlayUserData() {} + virtual ~InstantOverlayUserData() {} InstantOverlay* const overlay_; diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc index dc6a64f..7e7b3ba 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc @@ -76,7 +76,7 @@ class StubNotificationUIManager : public NotificationUIManager { // Returns true if any notifications match the supplied ID, either currently // displayed or in the queue. - virtual bool DoesIdExist(const std::string& id) { + virtual bool DoesIdExist(const std::string& id) OVERRIDE { return true; } @@ -174,7 +174,7 @@ class ChromeNotifierServiceTest : public testing::Test { : sync_processor_(new TestChangeProcessor), sync_processor_delegate_(new SyncChangeProcessorDelegate( sync_processor_.get())) {} - ~ChromeNotifierServiceTest() {} + virtual ~ChromeNotifierServiceTest() {} // Methods from testing::Test. virtual void SetUp() {} diff --git a/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc b/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc index e44245a..058d16b 100644 --- a/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc +++ b/chrome/browser/notifications/sync_notifier/synced_notification_unittest.cc @@ -40,7 +40,7 @@ class SyncedNotificationTest : public testing::Test { public: SyncedNotificationTest() : notification1(NULL), notification2(NULL) {} - ~SyncedNotificationTest() {} + virtual ~SyncedNotificationTest() {} // Methods from testing::Test. diff --git a/chrome/browser/sync/test/integration/autofill_helper.cc b/chrome/browser/sync/test/integration/autofill_helper.cc index be2987d..6b8250d 100644 --- a/chrome/browser/sync/test/integration/autofill_helper.cc +++ b/chrome/browser/sync/test/integration/autofill_helper.cc @@ -39,7 +39,7 @@ class AutofillDBThreadObserverHelper : public DBThreadObserverHelper { protected: virtual ~AutofillDBThreadObserverHelper() {} - virtual void RegisterObservers() { + virtual void RegisterObservers() OVERRIDE { registrar_.Add(&observer_, chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED, content::NotificationService::AllSources()); diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc index d1ded3e..49ca45d 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.cc +++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc @@ -45,13 +45,13 @@ class HistoryEmptyTask : public history::HistoryDBTask { explicit HistoryEmptyTask(base::WaitableEvent* done) : done_(done) {} virtual bool RunOnDBThread(history::HistoryBackend* backend, - history::HistoryDatabase* db) { + history::HistoryDatabase* db) OVERRIDE { content::RunAllPendingInMessageLoop(); done_->Signal(); return true; } - virtual void DoneRunOnMainThread() {} + virtual void DoneRunOnMainThread() OVERRIDE {} private: virtual ~HistoryEmptyTask() {} diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index 3f42c5b..25a5431 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -72,7 +72,7 @@ class SyncServerStatusChecker : public net::URLFetcherDelegate { public: SyncServerStatusChecker() : running_(false) {} - virtual void OnURLFetchComplete(const net::URLFetcher* source) { + virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE { std::string data; source->GetResponseAsString(&data); running_ = diff --git a/chrome/browser/system_monitor/removable_storage_notifications.cc b/chrome/browser/system_monitor/removable_storage_notifications.cc index c572fc6..46e668d 100644 --- a/chrome/browser/system_monitor/removable_storage_notifications.cc +++ b/chrome/browser/system_monitor/removable_storage_notifications.cc @@ -37,11 +37,12 @@ class RemovableStorageNotifications::ReceiverImpl virtual ~ReceiverImpl() {} - void ProcessAttach(const std::string& id, - const string16& name, - const base::FilePath::StringType& location) OVERRIDE; + virtual void ProcessAttach( + const std::string& id, + const string16& name, + const base::FilePath::StringType& location) OVERRIDE; - void ProcessDetach(const std::string& id) OVERRIDE; + virtual void ProcessDetach(const std::string& id) OVERRIDE; private: RemovableStorageNotifications* notifications_; diff --git a/chrome/browser/ui/views/action_box_menu.cc b/chrome/browser/ui/views/action_box_menu.cc index 4e7242a..61f02bb 100644 --- a/chrome/browser/ui/views/action_box_menu.cc +++ b/chrome/browser/ui/views/action_box_menu.cc @@ -34,7 +34,8 @@ class ExtensionImageView : public views::ImageView, public IconImage::Observer { } private: - virtual void OnExtensionIconImageChanged(extensions::IconImage* image) { + virtual void OnExtensionIconImageChanged( + extensions::IconImage* image) OVERRIDE { SetImage(icon_->image_skia()); } diff --git a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc index a08d4c9..d6466f8 100644 --- a/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc +++ b/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc @@ -53,7 +53,7 @@ class TabScrubberTest : public InProcessBrowserTest, ash::internal::EventTransformationHandler::TRANSFORM_NONE); } - virtual void CleanUpOnMainThread() { + virtual void CleanUpOnMainThread() OVERRIDE { browser()->tab_strip_model()->RemoveObserver(this); } @@ -177,40 +177,44 @@ class TabScrubberTest : public InProcessBrowserTest, // TabStripModelObserver overrides. virtual void TabInsertedAt(content::WebContents* contents, int index, - bool foreground) {} + bool foreground) OVERRIDE {} virtual void TabClosingAt(TabStripModel* tab_strip_model, content::WebContents* contents, - int index) {} - virtual void TabDetachedAt(content::WebContents* contents, int index) {} - virtual void TabDeactivated(content::WebContents* contents) {} + int index) OVERRIDE {} + virtual void TabDetachedAt(content::WebContents* contents, + int index) OVERRIDE {} + virtual void TabDeactivated(content::WebContents* contents) OVERRIDE {} virtual void ActiveTabChanged(content::WebContents* old_contents, content::WebContents* new_contents, int index, - bool user_gesture) { + bool user_gesture) OVERRIDE { activation_order_.push_back(index); if (index == target_index_) quit_closure_.Run(); } - virtual void TabSelectionChanged(TabStripModel* tab_strip_model, - const ui::ListSelectionModel& old_model) {} + virtual void TabSelectionChanged( + TabStripModel* tab_strip_model, + const ui::ListSelectionModel& old_model) OVERRIDE {} virtual void TabMoved(content::WebContents* contents, int from_index, - int to_index) {} + int to_index) OVERRIDE {} virtual void TabChangedAt(content::WebContents* contents, int index, - TabChangeType change_type) {} + TabChangeType change_type) OVERRIDE {} virtual void TabReplacedAt(TabStripModel* tab_strip_model, content::WebContents* old_contents, content::WebContents* new_contents, - int index) {} + int index) OVERRIDE {} virtual void TabPinnedStateChanged(content::WebContents* contents, - int index) {} - virtual void TabMiniStateChanged(content::WebContents* contents, int index) {} + int index) OVERRIDE {} + virtual void TabMiniStateChanged(content::WebContents* contents, + int index) OVERRIDE { + } virtual void TabBlockedStateChanged(content::WebContents* contents, - int index) {} - virtual void TabStripEmpty() {} - virtual void TabStripModelDeleted() {} + int index) OVERRIDE {} + virtual void TabStripEmpty() OVERRIDE {} + virtual void TabStripModelDeleted() OVERRIDE {} // History of tab activation. Scrub() resets it. std::vector<int> activation_order_; diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index ce9384c..04652aa 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -561,7 +561,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView { UpdateZoomControls(); } - ~ZoomView() { + virtual ~ZoomView() { HostZoomMap::GetForBrowserContext( menu_->browser_->profile())->RemoveZoomLevelChangedCallback( zoom_callback_); diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index 1df9871..9660761 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -106,12 +106,12 @@ class GpuPixelBrowserTest : public InProcessBrowserTest { ref_img_option_(kReferenceImageNone) { } - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitchASCII(switches::kTestGLLib, "libllvmpipe.so"); } - virtual void SetUpInProcessBrowserTestFixture() { + virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); CommandLine* command_line = CommandLine::ForCurrentProcess(); @@ -520,7 +520,7 @@ IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, Canvas2DRedBoxHD) { class Canvas2DPixelTestSD : public GpuPixelBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { GpuPixelBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas); } diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc index d12b5b0..b98511c 100644 --- a/chrome/test/gpu/webgl_infobar_browsertest.cc +++ b/chrome/test/gpu/webgl_infobar_browsertest.cc @@ -50,14 +50,14 @@ void SimulateGPUCrash(Browser* browser) { class WebGLInfobarTest : public InProcessBrowserTest { protected: - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { // GPU tests require gpu acceleration. #if !defined(OS_MACOSX) command_line->AppendSwitchASCII( switches::kUseGL, gfx::kGLImplementationOSMesaName); #endif } - virtual void SetUpInProcessBrowserTestFixture() { + virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { base::FilePath test_dir; ASSERT_TRUE(PathService::Get(content::DIR_TEST_DATA, &test_dir)); gpu_test_dir_ = test_dir.AppendASCII("gpu"); diff --git a/chrome/test/perf/feature_startup_test.cc b/chrome/test/perf/feature_startup_test.cc index 564dbfe..c11a386 100644 --- a/chrome/test/perf/feature_startup_test.cc +++ b/chrome/test/perf/feature_startup_test.cc @@ -28,8 +28,8 @@ class NewTabUIStartupTest : public UIPerfTest { show_window_ = true; } - void SetUp() {} - void TearDown() {} + virtual void SetUp() {} + virtual void TearDown() {} static const int kNumCycles = 5; diff --git a/chrome/test/perf/indexeddb_uitest.cc b/chrome/test/perf/indexeddb_uitest.cc index 22ef5dc..66ed7e4 100644 --- a/chrome/test/perf/indexeddb_uitest.cc +++ b/chrome/test/perf/indexeddb_uitest.cc @@ -97,7 +97,7 @@ class IndexedDBReferenceTest : public IndexedDBTest { reference_ = true; } - void SetUp() { + virtual void SetUp() { UseReferenceBuild(); IndexedDBTest::SetUp(); } diff --git a/chrome/test/perf/memory_test.cc b/chrome/test/perf/memory_test.cc index add948b..822d443 100644 --- a/chrome/test/perf/memory_test.cc +++ b/chrome/test/perf/memory_test.cc @@ -35,7 +35,7 @@ class MemoryTest : public UIPerfTest { public: MemoryTest() : cleanup_temp_dir_on_exit_(false) {} - ~MemoryTest() { + virtual ~MemoryTest() { // Cleanup our temporary directory. if (cleanup_temp_dir_on_exit_) file_util::Delete(temp_dir_, true); @@ -248,7 +248,7 @@ class MemoryTest : public UIPerfTest { class GeneralMixMemoryTest : public MemoryTest { public: - virtual base::FilePath GetUserDataDirSource() const { + virtual base::FilePath GetUserDataDirSource() const OVERRIDE { base::FilePath profile_dir; PathService::Get(base::DIR_SOURCE_ROOT, &profile_dir); profile_dir = profile_dir.AppendASCII("data"); @@ -257,7 +257,7 @@ class GeneralMixMemoryTest : public MemoryTest { return profile_dir; } - virtual size_t GetUrlList(std::string** list) { + virtual size_t GetUrlList(std::string** list) OVERRIDE { *list = urls_; return urls_length_; } @@ -399,7 +399,7 @@ size_t GeneralMixMemoryTest::urls_length_ = class GeneralMixReferenceMemoryTest : public GeneralMixMemoryTest { public: - void SetUp() { + virtual void SetUp() { UseReferenceBuild(); GeneralMixMemoryTest::SetUp(); } @@ -413,7 +413,7 @@ class MembusterMemoryTest : public MemoryTest { delete[] test_urls_; } - virtual base::FilePath GetUserDataDirSource() const { + virtual base::FilePath GetUserDataDirSource() const OVERRIDE { base::FilePath profile_dir; PathService::Get(base::DIR_SOURCE_ROOT, &profile_dir); profile_dir = profile_dir.AppendASCII("data"); @@ -422,7 +422,7 @@ class MembusterMemoryTest : public MemoryTest { return profile_dir; } - virtual size_t GetUrlList(std::string** list) { + virtual size_t GetUrlList(std::string** list) OVERRIDE { size_t total_url_entries = urls_length_ * kIterations_ * 2 - 1; if (!test_urls_) { test_urls_ = new std::string[total_url_entries]; diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc index 3366514..f72e247 100644 --- a/chrome/test/perf/page_cycler_test.cc +++ b/chrome/test/perf/page_cycler_test.cc @@ -304,7 +304,7 @@ class PageCyclerTest : public UIPerfTest { class PageCyclerReferenceTest : public PageCyclerTest { public: - void SetUp() { + virtual void SetUp() { UseReferenceBuild(); PageCyclerTest::SetUp(); } @@ -411,15 +411,15 @@ class PageCyclerDatabaseTest : public PageCyclerTest { print_times_only_ = true; } - virtual base::FilePath GetDataPath(const char* name) { + virtual base::FilePath GetDataPath(const char* name) OVERRIDE { return GetDatabaseDataPath(name); } - virtual bool HasErrors(const std::string timings) { + virtual bool HasErrors(const std::string timings) OVERRIDE { return HasDatabaseErrors(timings); } - virtual int GetTestIterations() { + virtual int GetTestIterations() OVERRIDE { return kDatabaseTestIterations; } }; @@ -430,15 +430,15 @@ class PageCyclerDatabaseReferenceTest : public PageCyclerReferenceTest { print_times_only_ = true; } - virtual base::FilePath GetDataPath(const char* name) { + virtual base::FilePath GetDataPath(const char* name) OVERRIDE { return GetDatabaseDataPath(name); } - virtual bool HasErrors(const std::string timings) { + virtual bool HasErrors(const std::string timings) OVERRIDE { return HasDatabaseErrors(timings); } - virtual int GetTestIterations() { + virtual int GetTestIterations() OVERRIDE { return kDatabaseTestIterations; } }; @@ -449,15 +449,15 @@ class PageCyclerIndexedDatabaseTest : public PageCyclerTest { print_times_only_ = true; } - virtual base::FilePath GetDataPath(const char* name) { + virtual base::FilePath GetDataPath(const char* name) OVERRIDE { return GetIndexedDatabaseDataPath(name); } - virtual bool HasErrors(const std::string timings) { + virtual bool HasErrors(const std::string timings) OVERRIDE { return HasDatabaseErrors(timings); } - virtual int GetTestIterations() { + virtual int GetTestIterations() OVERRIDE { return kIDBTestIterations; } }; @@ -468,15 +468,15 @@ class PageCyclerIndexedDatabaseReferenceTest : public PageCyclerReferenceTest { print_times_only_ = true; } - virtual base::FilePath GetDataPath(const char* name) { + virtual base::FilePath GetDataPath(const char* name) OVERRIDE { return GetIndexedDatabaseDataPath(name); } - virtual bool HasErrors(const std::string timings) { + virtual bool HasErrors(const std::string timings) OVERRIDE { return HasDatabaseErrors(timings); } - virtual int GetTestIterations() { + virtual int GetTestIterations() OVERRIDE { return kIDBTestIterations; } }; diff --git a/chrome/test/perf/shutdown_test.cc b/chrome/test/perf/shutdown_test.cc index 32117fe..7cbc7b6 100644 --- a/chrome/test/perf/shutdown_test.cc +++ b/chrome/test/perf/shutdown_test.cc @@ -27,8 +27,8 @@ class ShutdownTest : public UIPerfTest { ShutdownTest() { show_window_ = true; } - void SetUp() {} - void TearDown() {} + virtual void SetUp() {} + virtual void TearDown() {} enum TestSize { SIMPLE, // Runs with no command line arguments (loads about:blank). diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc index 2a8ca54..c190a34 100644 --- a/chrome/test/perf/startup_test.cc +++ b/chrome/test/perf/startup_test.cc @@ -36,10 +36,10 @@ class StartupTest : public UIPerfTest { StartupTest() { show_window_ = true; } - void SetUp() { + virtual void SetUp() { collect_profiling_stats_ = false; } - void TearDown() {} + virtual void TearDown() {} enum TestColdness { WARM, @@ -100,7 +100,7 @@ class StartupTest : public UIPerfTest { } // Rewrite the preferences file to point to the proper image directory. - virtual void SetUpProfile() { + virtual void SetUpProfile() OVERRIDE { UIPerfTest::SetUpProfile(); if (profile_type_ != UITestBase::COMPLEX_THEME) return; diff --git a/chrome/test/perf/tab_switching_test.cc b/chrome/test/perf/tab_switching_test.cc index 9878622..c850567 100644 --- a/chrome/test/perf/tab_switching_test.cc +++ b/chrome/test/perf/tab_switching_test.cc @@ -43,7 +43,7 @@ class TabSwitchingUITest : public UIPerfTest { show_window_ = true; } - void SetUp() { + virtual void SetUp() { // Set the log_file_name_ path according to the selected browser_directory_. log_file_name_ = browser_directory_.AppendASCII("chrome_debug.log"); diff --git a/chrome/test/perf/url_fetch_test.cc b/chrome/test/perf/url_fetch_test.cc index 0b337c6..f4a05725 100644 --- a/chrome/test/perf/url_fetch_test.cc +++ b/chrome/test/perf/url_fetch_test.cc @@ -32,7 +32,7 @@ class UrlFetchTest : public UIPerfTest { std::string javascript_variable; }; - void SetUp() { + virtual void SetUp() { const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); if (cmd_line->HasSwitch("reference_build")) { UseReferenceBuild(); diff --git a/chromeos/ime/ibus_bridge.cc b/chromeos/ime/ibus_bridge.cc index 691ff89..630cf37 100644 --- a/chromeos/ime/ibus_bridge.cc +++ b/chromeos/ime/ibus_bridge.cc @@ -31,39 +31,41 @@ class IBusBridgeImpl : public IBusBridge { } // IBusBridge override. - void SetInputContextHandler( + virtual void SetInputContextHandler( IBusInputContextHandlerInterface* handler) OVERRIDE { input_context_handler_ = handler; } // IBusBridge override. - IBusEngineHandlerInterface* GetEngineHandler() const { + virtual IBusEngineHandlerInterface* GetEngineHandler() const OVERRIDE { return engine_handler_; } // IBusBridge override. - void SetEngineHandler(IBusEngineHandlerInterface* handler) { + virtual void SetEngineHandler(IBusEngineHandlerInterface* handler) OVERRIDE { engine_handler_ = handler; } // IBusBridge override. - IBusPanelCandidateWindowHandlerInterface* GetCandidateWindowHandler() const { + virtual IBusPanelCandidateWindowHandlerInterface* + GetCandidateWindowHandler() const OVERRIDE { return candidate_window_handler_; } // IBusBridge override. - void SetCandidateWindowHandler( - IBusPanelCandidateWindowHandlerInterface* handler) { + virtual void SetCandidateWindowHandler( + IBusPanelCandidateWindowHandlerInterface* handler) OVERRIDE { candidate_window_handler_ = handler; } // IBusBridge override. - IBusPanelPropertyHandlerInterface* GetPanelHandler() const { + virtual IBusPanelPropertyHandlerInterface* GetPanelHandler() const OVERRIDE { return panel_handler_; } // IBusBridge override. - void SetPanelHandler(IBusPanelPropertyHandlerInterface* handler) { + virtual void SetPanelHandler( + IBusPanelPropertyHandlerInterface* handler) OVERRIDE { panel_handler_ = handler; } diff --git a/content/browser/gpu/gpu_pixel_browsertest.cc b/content/browser/gpu/gpu_pixel_browsertest.cc index 49aa9a8..391c899 100644 --- a/content/browser/gpu/gpu_pixel_browsertest.cc +++ b/content/browser/gpu/gpu_pixel_browsertest.cc @@ -105,12 +105,12 @@ class GpuPixelBrowserTest : public ContentBrowserTest { ref_img_option_(kReferenceImageNone) { } - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitchASCII(switches::kTestGLLib, "libllvmpipe.so"); } - virtual void SetUpInProcessBrowserTestFixture() { + virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { ContentBrowserTest::SetUpInProcessBrowserTestFixture(); CommandLine* command_line = CommandLine::ForCurrentProcess(); @@ -499,7 +499,7 @@ IN_PROC_BROWSER_TEST_F(GpuPixelBrowserTest, MANUAL_Canvas2DRedBoxHD) { class GpuPixelTestCanvas2DSD : public GpuPixelBrowserTest { public: - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { GpuPixelBrowserTest::SetUpCommandLine(command_line); command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas); } diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc index 4a02580..6f61d99 100644 --- a/content/browser/in_process_webkit/indexed_db_browsertest.cc +++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc @@ -323,7 +323,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestWithCorruptLevelDB, class IndexedDBBrowserTestWithMissingSSTFile : public IndexedDBBrowserTestWithPreexistingLevelDB { - virtual std::string EnclosingLevelDBDir() { + virtual std::string EnclosingLevelDBDir() OVERRIDE { return "missing_sst"; } }; diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc index bbe7b2e..bc554c2 100644 --- a/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc @@ -22,7 +22,7 @@ namespace content { class SecurityExploitBrowserTest : public ContentBrowserTest { public: SecurityExploitBrowserTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { ASSERT_TRUE(test_server()->Start()); // Add a host resolver rule to map all outgoing requests to the test server. diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc index 7f39261..b029296 100644 --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc @@ -66,7 +66,7 @@ class WebContentsViewAuraTest : public ContentBrowserTest { public: WebContentsViewAuraTest() {} - virtual void SetUpCommandLine(CommandLine* command_line) { + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { command_line->AppendSwitch(switches::kEnableOverscrollHistoryNavigation); } diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc index 4cab2ed..c72889d 100644 --- a/content/renderer/media/mock_peer_connection_impl.cc +++ b/content/renderer/media/mock_peer_connection_impl.cc @@ -144,7 +144,7 @@ class MockDtmfSender : public DtmfSenderInterface { virtual void UnregisterObserver() OVERRIDE { observer_ = NULL; } - virtual bool CanInsertDtmf() { + virtual bool CanInsertDtmf() OVERRIDE { return true; } virtual bool InsertDtmf(const std::string& tones, int duration, diff --git a/content/renderer/memory_benchmarking_extension.cc b/content/renderer/memory_benchmarking_extension.cc index 20e3e16..2dbfbda 100644 --- a/content/renderer/memory_benchmarking_extension.cc +++ b/content/renderer/memory_benchmarking_extension.cc @@ -40,7 +40,7 @@ class MemoryBenchmarkingWrapper : public v8::Extension { ) {} virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction( - v8::Handle<v8::String> name) { + v8::Handle<v8::String> name) OVERRIDE { if (name->Equals(v8::String::New("IsHeapProfilerRunning"))) return v8::FunctionTemplate::New(IsHeapProfilerRunning); else if (name->Equals(v8::String::New("HeapProfilerDump"))) |