From 49fd7e2236c370b3affab9788fa5fc4c998729a1 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Mon, 21 Nov 2011 16:52:21 +0000 Subject: Add OVERRIDE to chrome/browser/. BUG=104314 TEST=no change Review URL: http://codereview.chromium.org/8614003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110940 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/omnibox_search_hint.h | 3 +- chrome/browser/parsers/metadata_parser_filebase.h | 14 ++--- chrome/browser/parsers/metadata_parser_jpeg.h | 4 +- .../browser/parsers/metadata_parser_jpeg_factory.h | 9 ++-- chrome/browser/password_manager_delegate_impl.h | 12 +++-- chrome/browser/plugin_data_remover_helper.h | 2 +- chrome/browser/plugin_observer.h | 2 +- .../browser/policy/asynchronous_policy_test_base.h | 2 +- .../browser/policy/configuration_policy_provider.h | 4 +- .../policy/configuration_policy_provider_test.h | 4 +- .../policy/device_management_backend_impl.h | 6 +-- chrome/browser/preferences_mock_mac.h | 9 ++-- chrome/browser/prefs/overlay_user_pref_store.h | 35 +++++++------ chrome/browser/prefs/pref_member.h | 2 +- chrome/browser/prefs/pref_notifier_impl.h | 4 +- chrome/browser/prefs/pref_set_observer.h | 2 +- chrome/browser/prefs/pref_value_store.h | 4 +- chrome/browser/prefs/testing_pref_store.h | 31 +++++------ chrome/browser/prefs/value_map_pref_store.h | 6 +-- .../cloud_print/cloud_print_proxy_service.h | 2 +- .../printing/cloud_print/cloud_print_setup_flow.h | 4 +- .../cloud_print/cloud_print_setup_handler.h | 2 +- .../cloud_print/cloud_print_setup_source.h | 4 +- .../browser/printing/print_dialog_cloud_internal.h | 4 +- chrome/browser/printing/print_job_manager.h | 2 +- .../printing/print_preview_tab_controller.h | 2 +- chrome/browser/printing/printing_message_filter.h | 7 +-- .../profiles/off_the_record_profile_io_data.h | 9 ++-- chrome/browser/profiles/profile_impl_io_data.h | 9 ++-- chrome/browser/profiles/profile_io_data.h | 2 +- chrome/browser/profiles/profile_manager.h | 10 ++-- .../renderer_host/chrome_render_message_filter.h | 7 +-- chrome/browser/repost_form_warning_controller.h | 3 +- .../browser/safe_browsing/safe_browsing_database.h | 31 ++++++----- .../safe_browsing/safe_browsing_store_file.h | 2 +- .../search_engines/search_provider_install_data.h | 5 +- .../search_provider_install_state_message_filter.h | 2 +- chrome/browser/search_engines/search_terms_data.h | 9 ++-- .../browser/search_engines/template_url_service.h | 7 +-- .../search_engines/template_url_service_factory.h | 13 ++--- .../template_url_service_test_util.h | 2 +- chrome/browser/service/service_process_control.h | 4 +- chrome/browser/sessions/session_service.h | 6 +-- chrome/browser/sessions/session_service_factory.h | 7 +-- chrome/browser/sessions/tab_restore_service.h | 2 +- .../browser/sessions/tab_restore_service_factory.h | 5 +- chrome/browser/shell_integration.h | 8 +-- chrome/browser/sidebar/sidebar_manager.h | 4 +- chrome/browser/speech/speech_input_bubble.h | 12 ++--- .../speech/speech_input_bubble_controller.h | 7 +-- chrome/browser/spellchecker/spellcheck_host_impl.h | 8 +-- .../spellchecker/spellcheck_message_filter.h | 7 +-- chrome/browser/ssl/ssl_blocking_page.h | 10 ++-- chrome/browser/tab_contents/background_contents.h | 2 +- .../tab_contents/chrome_interstitial_page.h | 4 +- .../insecure_content_infobar_delegate.h | 2 +- .../tab_contents/render_view_context_menu_mac.h | 10 ++-- .../browser/tab_contents/tab_contents_view_mac.h | 26 +++++----- chrome/browser/tab_contents/thumbnail_generator.h | 6 +-- chrome/browser/tabs/default_tab_handler.h | 57 ++++++++++---------- chrome/browser/tabs/pinned_tab_service.h | 3 +- chrome/browser/tabs/tab_strip_model.h | 2 +- .../tabs/tab_strip_model_order_controller.h | 4 +- .../task_manager/task_manager_resource_providers.h | 60 +++++++++++----------- .../task_manager_worker_resource_provider.h | 8 +-- chrome/browser/themes/theme_service.h | 31 +++++------ chrome/browser/themes/theme_service_factory.h | 5 +- chrome/browser/translate/languages_menu_model.h | 13 ++--- chrome/browser/translate/options_menu_model.h | 13 ++--- chrome/browser/translate/translate_manager.h | 4 +- chrome/browser/transport_security_persister.h | 4 +- .../ui/blocked_content/blocked_content_container.h | 11 ++-- chrome/browser/ui/browser.h | 20 ++++---- chrome/browser/ui/browser_navigator_browsertest.h | 5 +- chrome/browser/ui/find_bar/find_bar_controller.h | 2 +- chrome/browser/ui/login/login_prompt.h | 6 +-- .../ui/search_engines/template_url_table_model.h | 2 +- .../browser/ui/toolbar/back_forward_menu_model.h | 34 ++++++------ .../browser/ui/views/extensions/extension_dialog.h | 2 +- chrome/browser/user_style_sheet_watcher.h | 2 +- .../visitedlink/visitedlink_event_listener.h | 10 ++-- .../browser/web_resource/gpu_blacklist_updater.h | 2 +- chrome/browser/webdata/autofill_table.h | 5 +- chrome/browser/webdata/keyword_table.h | 5 +- chrome/browser/webdata/logins_table.h | 5 +- chrome/browser/webdata/token_service_table.h | 5 +- chrome/browser/webdata/web_apps_table.h | 5 +- chrome/browser/webdata/web_intents_table.h | 5 +- 88 files changed, 400 insertions(+), 353 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/omnibox_search_hint.h b/chrome/browser/omnibox_search_hint.h index 5753736..348abf2 100644 --- a/chrome/browser/omnibox_search_hint.h +++ b/chrome/browser/omnibox_search_hint.h @@ -9,6 +9,7 @@ #include #include +#include "base/compiler_specific.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -28,7 +29,7 @@ class OmniboxSearchHint : public content::NotificationObserver { // content::NotificationObserver method: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Focus the location bar and displays a message instructing that search // queries can be typed directly in there. diff --git a/chrome/browser/parsers/metadata_parser_filebase.h b/chrome/browser/parsers/metadata_parser_filebase.h index e1614a8..cca7085 100644 --- a/chrome/browser/parsers/metadata_parser_filebase.h +++ b/chrome/browser/parsers/metadata_parser_filebase.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. @@ -24,10 +24,10 @@ class FileMetadataParser : public MetadataParser { virtual ~FileMetadataParser(); // Implementation of MetadataParser - virtual bool Parse(); - virtual bool GetProperty(const std::string& key, std::string* value); + virtual bool Parse() OVERRIDE; + virtual bool GetProperty(const std::string& key, std::string* value) OVERRIDE; - virtual MetadataPropertyIterator* GetPropertyIterator(); + virtual MetadataPropertyIterator* GetPropertyIterator() OVERRIDE; protected: PropertyMap properties_; @@ -44,9 +44,9 @@ class FileMetadataPropertyIterator : public MetadataPropertyIterator { virtual ~FileMetadataPropertyIterator(); // Implementation of MetadataPropertyIterator - virtual bool GetNext(std::string* key, std::string* value); - virtual int Length(); - virtual bool IsEnd(); + virtual bool GetNext(std::string* key, std::string* value) OVERRIDE; + virtual int Length() OVERRIDE; + virtual bool IsEnd() OVERRIDE; private: PropertyMap& properties_; diff --git a/chrome/browser/parsers/metadata_parser_jpeg.h b/chrome/browser/parsers/metadata_parser_jpeg.h index cfd193a9..b18e66b 100644 --- a/chrome/browser/parsers/metadata_parser_jpeg.h +++ b/chrome/browser/parsers/metadata_parser_jpeg.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. @@ -12,7 +12,7 @@ class JpegMetadataParser : public FileMetadataParser { public: explicit JpegMetadataParser(const FilePath& path); // Implementation of MetadataParser - virtual bool Parse(); + virtual bool Parse() OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(JpegMetadataParser); diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.h b/chrome/browser/parsers/metadata_parser_jpeg_factory.h index 9a4546a..8ba21e5 100644 --- a/chrome/browser/parsers/metadata_parser_jpeg_factory.h +++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.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. @@ -7,6 +7,7 @@ #pragma once #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "chrome/browser/parsers/metadata_parser_factory.h" class FilePath; @@ -16,8 +17,10 @@ class MetadataParserJpegFactory : public MetadataParserFactory { MetadataParserJpegFactory(); // Implementation of MetadataParserFactory - virtual bool CanParse(const FilePath& path, char* bytes, int bytes_size); - virtual MetadataParser* CreateParser(const FilePath& path); + virtual bool CanParse(const FilePath& path, + char* bytes, + int bytes_size) OVERRIDE; + virtual MetadataParser* CreateParser(const FilePath& path) OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(MetadataParserJpegFactory); diff --git a/chrome/browser/password_manager_delegate_impl.h b/chrome/browser/password_manager_delegate_impl.h index 82e58f3fe..5552568f 100644 --- a/chrome/browser/password_manager_delegate_impl.h +++ b/chrome/browser/password_manager_delegate_impl.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. @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PASSWORD_MANAGER_DELEGATE_IMPL_H_ #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "chrome/browser/password_manager/password_manager_delegate.h" class TabContentsWrapper; @@ -17,10 +18,11 @@ class PasswordManagerDelegateImpl : public PasswordManagerDelegate { // PasswordManagerDelegate implementation. virtual void FillPasswordForm( - const webkit_glue::PasswordFormFillData& form_data); - virtual void AddSavePasswordInfoBar(PasswordFormManager* form_to_save); - virtual Profile* GetProfileForPasswordManager(); - virtual bool DidLastPageLoadEncounterSSLErrors(); + const webkit_glue::PasswordFormFillData& form_data) OVERRIDE; + virtual void AddSavePasswordInfoBar( + PasswordFormManager* form_to_save) OVERRIDE; + virtual Profile* GetProfileForPasswordManager() OVERRIDE; + virtual bool DidLastPageLoadEncounterSSLErrors() OVERRIDE; private: TabContentsWrapper* tab_contents_; DISALLOW_COPY_AND_ASSIGN(PasswordManagerDelegateImpl); diff --git a/chrome/browser/plugin_data_remover_helper.h b/chrome/browser/plugin_data_remover_helper.h index d83369e..938b17c 100644 --- a/chrome/browser/plugin_data_remover_helper.h +++ b/chrome/browser/plugin_data_remover_helper.h @@ -48,7 +48,7 @@ class PluginDataRemoverHelper : public content::NotificationObserver { // content::NotificationObserver methods: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; private: void StartUpdate(); diff --git a/chrome/browser/plugin_observer.h b/chrome/browser/plugin_observer.h index a8d40d4..082a180 100644 --- a/chrome/browser/plugin_observer.h +++ b/chrome/browser/plugin_observer.h @@ -18,7 +18,7 @@ class PluginObserver : public TabContentsObserver { virtual ~PluginObserver(); // IPC::Channel::Listener implementation. - virtual bool OnMessageReceived(const IPC::Message& message); + virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; private: void OnBlockedOutdatedPlugin(const string16& name, const GURL& update_url); diff --git a/chrome/browser/policy/asynchronous_policy_test_base.h b/chrome/browser/policy/asynchronous_policy_test_base.h index 7771490..33f4c5d 100644 --- a/chrome/browser/policy/asynchronous_policy_test_base.h +++ b/chrome/browser/policy/asynchronous_policy_test_base.h @@ -34,7 +34,7 @@ class AsynchronousPolicyTestBase : public testing::Test { virtual ~AsynchronousPolicyTestBase(); // testing::Test: - virtual void TearDown(); + virtual void TearDown() OVERRIDE; protected: // Create an actual IO loop (needed by FilePathWatcher). diff --git a/chrome/browser/policy/configuration_policy_provider.h b/chrome/browser/policy/configuration_policy_provider.h index efe93cd..5a52ff0 100644 --- a/chrome/browser/policy/configuration_policy_provider.h +++ b/chrome/browser/policy/configuration_policy_provider.h @@ -100,8 +100,8 @@ class ConfigurationPolicyObserverRegistrar ConfigurationPolicyProvider::Observer* observer); // ConfigurationPolicyProvider::Observer implementation: - virtual void OnUpdatePolicy(); - virtual void OnProviderGoingAway(); + virtual void OnUpdatePolicy() OVERRIDE; + virtual void OnProviderGoingAway() OVERRIDE; ConfigurationPolicyProvider* provider() { return provider_; } diff --git a/chrome/browser/policy/configuration_policy_provider_test.h b/chrome/browser/policy/configuration_policy_provider_test.h index 90b36f0..45f1165 100644 --- a/chrome/browser/policy/configuration_policy_provider_test.h +++ b/chrome/browser/policy/configuration_policy_provider_test.h @@ -90,8 +90,8 @@ class ConfigurationPolicyProviderTest ConfigurationPolicyProviderTest(); virtual ~ConfigurationPolicyProviderTest(); - virtual void SetUp(); - virtual void TearDown(); + virtual void SetUp() OVERRIDE; + virtual void TearDown() OVERRIDE; // Installs a valid policy and checks whether the provider returns the // |expected_value|. diff --git a/chrome/browser/policy/device_management_backend_impl.h b/chrome/browser/policy/device_management_backend_impl.h index 4354c98..ff4f3ff 100644 --- a/chrome/browser/policy/device_management_backend_impl.h +++ b/chrome/browser/policy/device_management_backend_impl.h @@ -64,18 +64,18 @@ class DeviceManagementBackendImpl : public DeviceManagementBackend { const std::string& oauth_token, const std::string& device_id, const em::DeviceRegisterRequest& request, - DeviceRegisterResponseDelegate* response_delegate); + DeviceRegisterResponseDelegate* response_delegate) OVERRIDE; virtual void ProcessUnregisterRequest( const std::string& device_management_token, const std::string& device_id, const em::DeviceUnregisterRequest& request, - DeviceUnregisterResponseDelegate* response_delegate); + DeviceUnregisterResponseDelegate* response_delegate) OVERRIDE; virtual void ProcessPolicyRequest( const std::string& device_management_token, const std::string& device_id, CloudPolicyDataStore::UserAffiliation affiliation, const em::DevicePolicyRequest& request, - DevicePolicyResponseDelegate* response_delegate); + DevicePolicyResponseDelegate* response_delegate) OVERRIDE; // Converts a user affiliation to the appropriate query parameter value. static const char* UserAffiliationToString( diff --git a/chrome/browser/preferences_mock_mac.h b/chrome/browser/preferences_mock_mac.h index 85e0e30..822286b 100644 --- a/chrome/browser/preferences_mock_mac.h +++ b/chrome/browser/preferences_mock_mac.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. @@ -15,12 +15,13 @@ class MockPreferences : public MacPreferences { MockPreferences(); virtual ~MockPreferences(); - virtual Boolean AppSynchronize(CFStringRef applicationID); + virtual Boolean AppSynchronize(CFStringRef applicationID) OVERRIDE; virtual CFPropertyListRef CopyAppValue(CFStringRef key, - CFStringRef applicationID); + CFStringRef applicationID) OVERRIDE; - virtual Boolean AppValueIsForced(CFStringRef key, CFStringRef applicationID); + virtual Boolean AppValueIsForced(CFStringRef key, + CFStringRef applicationID) OVERRIDE; // Adds a preference item with the given info to the test set. void AddTestItem(CFStringRef key, CFPropertyListRef value, bool is_forced); diff --git a/chrome/browser/prefs/overlay_user_pref_store.h b/chrome/browser/prefs/overlay_user_pref_store.h index 88d6e2c..eb2cac7 100644 --- a/chrome/browser/prefs/overlay_user_pref_store.h +++ b/chrome/browser/prefs/overlay_user_pref_store.h @@ -31,25 +31,26 @@ class OverlayUserPrefStore : public PersistentPrefStore, virtual bool IsSetInOverlay(const std::string& key) const; // Methods of PrefStore. - virtual void AddObserver(PrefStore::Observer* observer); - virtual void RemoveObserver(PrefStore::Observer* observer); - virtual bool IsInitializationComplete() const; + virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE; + virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE; + virtual bool IsInitializationComplete() const OVERRIDE; virtual ReadResult GetValue(const std::string& key, - const base::Value** result) const; + const base::Value** result) const OVERRIDE; // Methods of PersistentPrefStore. virtual ReadResult GetMutableValue(const std::string& key, - base::Value** result); - virtual void SetValue(const std::string& key, base::Value* value); - virtual void SetValueSilently(const std::string& key, base::Value* value); - virtual void RemoveValue(const std::string& key); - virtual bool ReadOnly() const; - virtual PrefReadError ReadPrefs(); - virtual void ReadPrefsAsync(ReadErrorDelegate* delegate); - virtual bool WritePrefs(); - virtual void ScheduleWritePrefs(); - virtual void CommitPendingWrite(); - virtual void ReportValueChanged(const std::string& key); + base::Value** result) OVERRIDE; + virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE; + virtual void SetValueSilently(const std::string& key, + base::Value* value) OVERRIDE; + virtual void RemoveValue(const std::string& key) OVERRIDE; + virtual bool ReadOnly() const OVERRIDE; + virtual PrefReadError ReadPrefs() OVERRIDE; + virtual void ReadPrefsAsync(ReadErrorDelegate* delegate) OVERRIDE; + virtual bool WritePrefs() OVERRIDE; + virtual void ScheduleWritePrefs() OVERRIDE; + virtual void CommitPendingWrite() OVERRIDE; + virtual void ReportValueChanged(const std::string& key) OVERRIDE; protected: void RegisterOverlayProperty(const std::string& key); @@ -62,8 +63,8 @@ class OverlayUserPrefStore : public PersistentPrefStore, typedef std::map NamesMap; // Methods of PrefStore::Observer. - virtual void OnPrefValueChanged(const std::string& key); - virtual void OnInitializationCompleted(bool succeeded); + virtual void OnPrefValueChanged(const std::string& key) OVERRIDE; + virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; const std::string& GetOverlayKey(const std::string& underlay_key) const; const std::string& GetUnderlayKey(const std::string& overlay_key) const; diff --git a/chrome/browser/prefs/pref_member.h b/chrome/browser/prefs/pref_member.h index bb3434f..38c785a 100644 --- a/chrome/browser/prefs/pref_member.h +++ b/chrome/browser/prefs/pref_member.h @@ -94,7 +94,7 @@ class PrefMemberBase : public content::NotificationObserver { // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; void VerifyValuePrefName() const { DCHECK(!pref_name_.empty()); diff --git a/chrome/browser/prefs/pref_notifier_impl.h b/chrome/browser/prefs/pref_notifier_impl.h index b16ad11..e687a56 100644 --- a/chrome/browser/prefs/pref_notifier_impl.h +++ b/chrome/browser/prefs/pref_notifier_impl.h @@ -32,8 +32,8 @@ class PrefNotifierImpl : public PrefNotifier, void RemovePrefObserver(const char* path, content::NotificationObserver* obs); // PrefNotifier overrides. - virtual void OnPreferenceChanged(const std::string& pref_name); - virtual void OnInitializationCompleted(bool succeeded); + virtual void OnPreferenceChanged(const std::string& pref_name) OVERRIDE; + virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; protected: // A map from pref names to a list of observers. Observers get fired in the diff --git a/chrome/browser/prefs/pref_set_observer.h b/chrome/browser/prefs/pref_set_observer.h index 557bd83..acf02f3 100644 --- a/chrome/browser/prefs/pref_set_observer.h +++ b/chrome/browser/prefs/pref_set_observer.h @@ -46,7 +46,7 @@ class PrefSetObserver : public content::NotificationObserver { // Overridden from content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; typedef std::set PrefSet; PrefSet prefs_; diff --git a/chrome/browser/prefs/pref_value_store.h b/chrome/browser/prefs/pref_value_store.h index 6037633..b750296 100644 --- a/chrome/browser/prefs/pref_value_store.h +++ b/chrome/browser/prefs/pref_value_store.h @@ -153,8 +153,8 @@ class PrefValueStore { private: // PrefStore::Observer implementation. - virtual void OnPrefValueChanged(const std::string& key); - virtual void OnInitializationCompleted(bool succeeded); + virtual void OnPrefValueChanged(const std::string& key) OVERRIDE; + virtual void OnInitializationCompleted(bool succeeded) OVERRIDE; // PrefValueStore this keeper is part of. PrefValueStore* pref_value_store_; diff --git a/chrome/browser/prefs/testing_pref_store.h b/chrome/browser/prefs/testing_pref_store.h index 106b836..6770352 100644 --- a/chrome/browser/prefs/testing_pref_store.h +++ b/chrome/browser/prefs/testing_pref_store.h @@ -22,24 +22,25 @@ class TestingPrefStore : public PersistentPrefStore { // Overriden from PrefStore. virtual ReadResult GetValue(const std::string& key, - const base::Value** result) const; - virtual void AddObserver(PrefStore::Observer* observer); - virtual void RemoveObserver(PrefStore::Observer* observer); - virtual bool IsInitializationComplete() const; + const base::Value** result) const OVERRIDE; + virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE; + virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE; + virtual bool IsInitializationComplete() const OVERRIDE; // PersistentPrefStore overrides: virtual ReadResult GetMutableValue(const std::string& key, - base::Value** result); - virtual void ReportValueChanged(const std::string& key); - virtual void SetValue(const std::string& key, base::Value* value); - virtual void SetValueSilently(const std::string& key, base::Value* value); - virtual void RemoveValue(const std::string& key); - virtual bool ReadOnly() const; - virtual PersistentPrefStore::PrefReadError ReadPrefs(); - virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate); - virtual bool WritePrefs(); - virtual void ScheduleWritePrefs() {} - virtual void CommitPendingWrite() {} + base::Value** result) OVERRIDE; + virtual void ReportValueChanged(const std::string& key) OVERRIDE; + virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE; + virtual void SetValueSilently(const std::string& key, + base::Value* value) OVERRIDE; + virtual void RemoveValue(const std::string& key) OVERRIDE; + virtual bool ReadOnly() const OVERRIDE; + virtual PersistentPrefStore::PrefReadError ReadPrefs() OVERRIDE; + virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE; + virtual bool WritePrefs() OVERRIDE; + virtual void ScheduleWritePrefs() OVERRIDE {} + virtual void CommitPendingWrite() OVERRIDE {} // Marks the store as having completed initialization. void SetInitializationCompleted(); diff --git a/chrome/browser/prefs/value_map_pref_store.h b/chrome/browser/prefs/value_map_pref_store.h index 1898055..0981a6f 100644 --- a/chrome/browser/prefs/value_map_pref_store.h +++ b/chrome/browser/prefs/value_map_pref_store.h @@ -23,9 +23,9 @@ class ValueMapPrefStore : public PrefStore { // PrefStore overrides: virtual ReadResult GetValue(const std::string& key, - const base::Value** value) const; - virtual void AddObserver(PrefStore::Observer* observer); - virtual void RemoveObserver(PrefStore::Observer* observer); + const base::Value** value) const OVERRIDE; + virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE; + virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE; iterator begin(); iterator end(); diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h index e34ef7a..18c8259 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h @@ -53,7 +53,7 @@ class CloudPrintProxyService std::string proxy_id() const { return proxy_id_; } // CloudPrintSetupHandler::Delegate implementation. - virtual void OnCloudPrintSetupClosed(); + virtual void OnCloudPrintSetupClosed() OVERRIDE; // content::NotificationObserver implementation. virtual void Observe(int type, diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h index a41ca40..cc6e278 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h @@ -84,9 +84,9 @@ class CloudPrintSetupFlow : public HtmlDialogUIDelegate, // GaiaAuthConsumer implementation. virtual void OnClientLoginSuccess( - const GaiaAuthConsumer::ClientLoginResult& credentials); + const GaiaAuthConsumer::ClientLoginResult& credentials) OVERRIDE; virtual void OnClientLoginFailure( - const GoogleServiceAuthError& error); + const GoogleServiceAuthError& error) OVERRIDE; private: friend class CloudPrintServiceProcessHelper; diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_handler.h b/chrome/browser/printing/cloud_print/cloud_print_setup_handler.h index 7a1563f..d5d24d4 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_handler.h +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_handler.h @@ -29,7 +29,7 @@ class CloudPrintSetupHandler virtual ~CloudPrintSetupHandler(); // CloudPrintSetupFlow::Delegate implementation. - virtual void OnDialogClosed(); + virtual void OnDialogClosed() OVERRIDE; private: Delegate* handler_; diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.h b/chrome/browser/printing/cloud_print/cloud_print_setup_source.h index 3703762..164e0f6 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.h +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.h @@ -16,9 +16,9 @@ class CloudPrintSetupSource : public ChromeURLDataManager::DataSource { CloudPrintSetupSource(); virtual void StartDataRequest(const std::string& path, bool is_incognito, - int request_id); + int request_id) OVERRIDE; - virtual std::string GetMimeType(const std::string& path) const; + virtual std::string GetMimeType(const std::string& path) const OVERRIDE; static const char kInvalidPasswordHelpUrl[]; static const char kCanNotAccessAccountUrl[]; diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h index a594bd9..c61d562 100644 --- a/chrome/browser/printing/print_dialog_cloud_internal.h +++ b/chrome/browser/printing/print_dialog_cloud_internal.h @@ -110,12 +110,12 @@ class CloudPrintFlowHandler : public WebUIMessageHandler, virtual ~CloudPrintFlowHandler(); // WebUIMessageHandler implementation. - virtual void RegisterMessages(); + virtual void RegisterMessages() OVERRIDE; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Callbacks from the page. void HandleShowDebugger(const base::ListValue* args); diff --git a/chrome/browser/printing/print_job_manager.h b/chrome/browser/printing/print_job_manager.h index 8d37537f..39fb381 100644 --- a/chrome/browser/printing/print_job_manager.h +++ b/chrome/browser/printing/print_job_manager.h @@ -52,7 +52,7 @@ class PrintJobManager : public content::NotificationObserver { // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; bool printing_enabled() { return *printing_enabled_; diff --git a/chrome/browser/printing/print_preview_tab_controller.h b/chrome/browser/printing/print_preview_tab_controller.h index b5ebb6b..abd5056 100644 --- a/chrome/browser/printing/print_preview_tab_controller.h +++ b/chrome/browser/printing/print_preview_tab_controller.h @@ -60,7 +60,7 @@ class PrintPreviewTabController // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Returns true if |tab| is a print preview tab. static bool IsPrintPreviewTab(TabContentsWrapper* tab); diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h index 955ff17..10afcba 100644 --- a/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h @@ -32,10 +32,11 @@ class PrintingMessageFilter : public BrowserMessageFilter { PrintingMessageFilter(); // BrowserMessageFilter methods. - virtual void OverrideThreadForMessage(const IPC::Message& message, - content::BrowserThread::ID* thread); + virtual void OverrideThreadForMessage( + const IPC::Message& message, + content::BrowserThread::ID* thread) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok); + bool* message_was_ok) OVERRIDE; private: virtual ~PrintingMessageFilter(); diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.h b/chrome/browser/profiles/off_the_record_profile_io_data.h index 79334a5..8e9964b 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.h +++ b/chrome/browser/profiles/off_the_record_profile_io_data.h @@ -93,16 +93,17 @@ class OffTheRecordProfileIOData : public ProfileIOData { OffTheRecordProfileIOData(); virtual ~OffTheRecordProfileIOData(); - virtual void LazyInitializeInternal(ProfileParams* profile_params) const; + virtual void LazyInitializeInternal( + ProfileParams* profile_params) const OVERRIDE; virtual scoped_refptr InitializeAppRequestContext( scoped_refptr main_context, - const std::string& app_id) const; + const std::string& app_id) const OVERRIDE; virtual scoped_refptr - AcquireMediaRequestContext() const; + AcquireMediaRequestContext() const OVERRIDE; virtual scoped_refptr AcquireIsolatedAppRequestContext( scoped_refptr main_context, - const std::string& app_id) const; + const std::string& app_id) const OVERRIDE; mutable scoped_ptr http_server_properties_; diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h index 1a8d905..b766119 100644 --- a/chrome/browser/profiles/profile_impl_io_data.h +++ b/chrome/browser/profiles/profile_impl_io_data.h @@ -121,16 +121,17 @@ class ProfileImplIOData : public ProfileIOData { ProfileImplIOData(); virtual ~ProfileImplIOData(); - virtual void LazyInitializeInternal(ProfileParams* profile_params) const; + virtual void LazyInitializeInternal( + ProfileParams* profile_params) const OVERRIDE; virtual scoped_refptr InitializeAppRequestContext( scoped_refptr main_context, - const std::string& app_id) const; + const std::string& app_id) const OVERRIDE; virtual scoped_refptr - AcquireMediaRequestContext() const; + AcquireMediaRequestContext() const OVERRIDE; virtual scoped_refptr AcquireIsolatedAppRequestContext( scoped_refptr main_context, - const std::string& app_id) const; + const std::string& app_id) const OVERRIDE; // Lazy initialization params. mutable scoped_ptr lazy_params_; diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h index a345366..7d16707 100644 --- a/chrome/browser/profiles/profile_io_data.h +++ b/chrome/browser/profiles/profile_io_data.h @@ -230,7 +230,7 @@ class ProfileIOData { virtual ~ResourceContext(); private: - virtual void EnsureInitialized() const; + virtual void EnsureInitialized() const OVERRIDE; const ProfileIOData* const io_data_; }; diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h index f12e80e..12c5d99 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h @@ -118,12 +118,12 @@ class ProfileManager : public base::NonThreadSafe, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // BrowserList::Observer implementation. - virtual void OnBrowserAdded(const Browser* browser); - virtual void OnBrowserRemoved(const Browser* browser); - virtual void OnBrowserSetLastActive(const Browser* browser); + virtual void OnBrowserAdded(const Browser* browser) OVERRIDE; + virtual void OnBrowserRemoved(const Browser* browser) OVERRIDE; + virtual void OnBrowserSetLastActive(const Browser* browser) OVERRIDE; // Indicate that an import process will run for the next created Profile. void SetWillImport(); @@ -156,7 +156,7 @@ class ProfileManager : public base::NonThreadSafe, BrowserInit::IsFirstRun is_first_run); // Profile::Delegate implementation: - virtual void OnProfileCreated(Profile* profile, bool success); + virtual void OnProfileCreated(Profile* profile, bool success) OVERRIDE; // Add or remove a profile launcher to/from the list of launchers waiting for // new profiles to be created from the multi-profile menu. diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.h b/chrome/browser/renderer_host/chrome_render_message_filter.h index 7eaa3ba..930094c 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.h +++ b/chrome/browser/renderer_host/chrome_render_message_filter.h @@ -36,9 +36,10 @@ class ChromeRenderMessageFilter : public BrowserMessageFilter { // BrowserMessageFilter methods: virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok); - virtual void OverrideThreadForMessage(const IPC::Message& message, - content::BrowserThread::ID* thread); + bool* message_was_ok) OVERRIDE; + virtual void OverrideThreadForMessage( + const IPC::Message& message, + content::BrowserThread::ID* thread) OVERRIDE; private: friend class content::BrowserThread; diff --git a/chrome/browser/repost_form_warning_controller.h b/chrome/browser/repost_form_warning_controller.h index a618538..7b8114a 100644 --- a/chrome/browser/repost_form_warning_controller.h +++ b/chrome/browser/repost_form_warning_controller.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_REPOST_FORM_WARNING_CONTROLLER_H_ #pragma once +#include "base/compiler_specific.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -33,7 +34,7 @@ class RepostFormWarningController : public content::NotificationObserver { // Watch for a new load or a closed tab and dismiss the dialog if they occur. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Close the warning dialog. void CloseDialog(); diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h index ae78d83..0c95a43 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.h +++ b/chrome/browser/safe_browsing/safe_browsing_database.h @@ -223,26 +223,29 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase { virtual ~SafeBrowsingDatabaseNew(); // Implement SafeBrowsingDatabase interface. - virtual void Init(const FilePath& filename); - virtual bool ResetDatabase(); + virtual void Init(const FilePath& filename) OVERRIDE; + virtual bool ResetDatabase() OVERRIDE; virtual bool ContainsBrowseUrl(const GURL& url, std::string* matching_list, std::vector* prefix_hits, std::vector* full_hits, - base::Time last_update); + base::Time last_update) OVERRIDE; virtual bool ContainsDownloadUrl(const std::vector& urls, - std::vector* prefix_hits); - virtual bool ContainsDownloadHashPrefix(const SBPrefix& prefix); - virtual bool ContainsCsdWhitelistedUrl(const GURL& url); - virtual bool ContainsDownloadWhitelistedUrl(const GURL& url); - virtual bool ContainsDownloadWhitelistedString(const std::string& str); - virtual bool UpdateStarted(std::vector* lists); + std::vector* prefix_hits) OVERRIDE; + virtual bool ContainsDownloadHashPrefix(const SBPrefix& prefix) OVERRIDE; + virtual bool ContainsCsdWhitelistedUrl(const GURL& url) OVERRIDE; + virtual bool ContainsDownloadWhitelistedUrl(const GURL& url) OVERRIDE; + virtual bool ContainsDownloadWhitelistedString( + const std::string& str) OVERRIDE; + virtual bool UpdateStarted(std::vector* lists) OVERRIDE; virtual void InsertChunks(const std::string& list_name, - const SBChunkList& chunks); - virtual void DeleteChunks(const std::vector& chunk_deletes); - virtual void UpdateFinished(bool update_succeeded); - virtual void CacheHashResults(const std::vector& prefixes, - const std::vector& full_hits); + const SBChunkList& chunks) OVERRIDE; + virtual void DeleteChunks( + const std::vector& chunk_deletes) OVERRIDE; + virtual void UpdateFinished(bool update_succeeded) OVERRIDE; + virtual void CacheHashResults( + const std::vector& prefixes, + const std::vector& full_hits) OVERRIDE; private: friend class SafeBrowsingDatabaseTest; diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file.h b/chrome/browser/safe_browsing/safe_browsing_store_file.h index f515d60..2731688 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_file.h +++ b/chrome/browser/safe_browsing/safe_browsing_store_file.h @@ -127,7 +127,7 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore { base::Time receive_time, const SBFullHash& full_hash) OVERRIDE; virtual bool WriteSubPrefix(int32 chunk_id, - int32 add_chunk_id, SBPrefix prefix); + int32 add_chunk_id, SBPrefix prefix) OVERRIDE; virtual bool WriteSubHash(int32 chunk_id, int32 add_chunk_id, const SBFullHash& full_hash) OVERRIDE; virtual bool FinishChunk() OVERRIDE; diff --git a/chrome/browser/search_engines/search_provider_install_data.h b/chrome/browser/search_engines/search_provider_install_data.h index fac303d..a7b8dfd 100644 --- a/chrome/browser/search_engines/search_provider_install_data.h +++ b/chrome/browser/search_engines/search_provider_install_data.h @@ -69,8 +69,9 @@ class SearchProviderInstallData : public WebDataServiceConsumer, // Notification that the keywords have been loaded. // This is invoked from WebDataService, and should not be directly // invoked. - virtual void OnWebDataServiceRequestDone(WebDataService::Handle h, - const WDTypedResult* result); + virtual void OnWebDataServiceRequestDone( + WebDataService::Handle h, + const WDTypedResult* result) OVERRIDE; // Stores information about the default search provider. void SetDefault(const TemplateURL* template_url); diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.h b/chrome/browser/search_engines/search_provider_install_state_message_filter.h index 5778b32..4f9c65c 100644 --- a/chrome/browser/search_engines/search_provider_install_state_message_filter.h +++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.h @@ -23,7 +23,7 @@ class SearchProviderInstallStateMessageFilter : public BrowserMessageFilter { // BrowserMessageFilter implementation. virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok); + bool* message_was_ok) OVERRIDE; private: // Figures out the install state for the search provider. diff --git a/chrome/browser/search_engines/search_terms_data.h b/chrome/browser/search_engines/search_terms_data.h index ec10801..dd4468a 100644 --- a/chrome/browser/search_engines/search_terms_data.h +++ b/chrome/browser/search_engines/search_terms_data.h @@ -9,6 +9,7 @@ #include #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/string16.h" class Profile; @@ -55,15 +56,15 @@ class UIThreadSearchTermsData : public SearchTermsData { void set_profile(Profile* profile) { profile_ = profile; } // Implementation of SearchTermsData. - virtual std::string GoogleBaseURLValue() const; - virtual std::string GetApplicationLocale() const; + virtual std::string GoogleBaseURLValue() const OVERRIDE; + virtual std::string GetApplicationLocale() const OVERRIDE; #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD) - virtual string16 GetRlzParameterValue() const; + virtual string16 GetRlzParameterValue() const OVERRIDE; #endif // This returns the empty string unless set_profile() has been called with a // non-NULL Profile. - virtual std::string InstantFieldTrialUrlParam() const; + virtual std::string InstantFieldTrialUrlParam() const OVERRIDE; // Used by tests to set the value for the Google base url. This takes // ownership of the given std::string. diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h index f956601..fe76da5 100644 --- a/chrome/browser/search_engines/template_url_service.h +++ b/chrome/browser/search_engines/template_url_service.h @@ -228,8 +228,9 @@ class TemplateURLService : public WebDataServiceConsumer, // Notification that the keywords have been loaded. // This is invoked from WebDataService, and should not be directly // invoked. - virtual void OnWebDataServiceRequestDone(WebDataService::Handle h, - const WDTypedResult* result); + virtual void OnWebDataServiceRequestDone( + WebDataService::Handle h, + const WDTypedResult* result) OVERRIDE; // Returns the locale-direction-adjusted short name for the given keyword. // Also sets the out param to indicate whether the keyword belongs to an @@ -246,7 +247,7 @@ class TemplateURLService : public WebDataServiceConsumer, // . PREF_CHANGED: checks whether the default search engine has changed. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // SyncableService implementation. diff --git a/chrome/browser/search_engines/template_url_service_factory.h b/chrome/browser/search_engines/template_url_service_factory.h index b70c5d0..f122281 100644 --- a/chrome/browser/search_engines/template_url_service_factory.h +++ b/chrome/browser/search_engines/template_url_service_factory.h @@ -28,12 +28,13 @@ class TemplateURLServiceFactory : public ProfileKeyedServiceFactory { virtual ~TemplateURLServiceFactory(); // ProfileKeyedServiceFactory: - virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile) const; - virtual void RegisterUserPrefs(PrefService* user_prefs); - virtual bool ServiceRedirectedInIncognito(); - virtual bool ServiceIsNULLWhileTesting(); - virtual void ProfileShutdown(Profile* profile); - virtual void ProfileDestroyed(Profile* profile); + virtual ProfileKeyedService* BuildServiceInstanceFor( + Profile* profile) const OVERRIDE; + virtual void RegisterUserPrefs(PrefService* user_prefs) OVERRIDE; + virtual bool ServiceRedirectedInIncognito() OVERRIDE; + virtual bool ServiceIsNULLWhileTesting() OVERRIDE; + virtual void ProfileShutdown(Profile* profile) OVERRIDE; + virtual void ProfileDestroyed(Profile* profile) OVERRIDE; }; #endif // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_FACTORY_H_ diff --git a/chrome/browser/search_engines/template_url_service_test_util.h b/chrome/browser/search_engines/template_url_service_test_util.h index ae90b0c..e29d784 100644 --- a/chrome/browser/search_engines/template_url_service_test_util.h +++ b/chrome/browser/search_engines/template_url_service_test_util.h @@ -40,7 +40,7 @@ class TemplateURLServiceTestUtil : public TemplateURLServiceObserver { void TearDown(); // TemplateURLServiceObserver implemementation. - virtual void OnTemplateURLServiceChanged(); + virtual void OnTemplateURLServiceChanged() OVERRIDE; // Gets the observer count. int GetObserverCount(); diff --git a/chrome/browser/service/service_process_control.h b/chrome/browser/service/service_process_control.h index 1e4261d..c6d8dd5 100644 --- a/chrome/browser/service/service_process_control.h +++ b/chrome/browser/service/service_process_control.h @@ -77,12 +77,12 @@ class ServiceProcessControl : public IPC::Channel::Sender, virtual void OnChannelError() OVERRIDE; // IPC::Channel::Sender implementation - virtual bool Send(IPC::Message* message); + virtual bool Send(IPC::Message* message) OVERRIDE; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Message handlers void OnCloudPrintProxyInfo( diff --git a/chrome/browser/sessions/session_service.h b/chrome/browser/sessions/session_service.h index 6c863b2..6cbe60f 100644 --- a/chrome/browser/sessions/session_service.h +++ b/chrome/browser/sessions/session_service.h @@ -182,7 +182,7 @@ class SessionService : public BaseSessionService, // Overridden from BaseSessionService because we want some UMA reporting on // session update activities. - virtual void Save(); + virtual void Save() OVERRIDE; private: typedef std::map > IdToRange; @@ -208,7 +208,7 @@ class SessionService : public BaseSessionService, virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Sets the application extension id of the specified tab. void SetTabExtensionAppID(const SessionID& window_id, @@ -350,7 +350,7 @@ class SessionService : public BaseSessionService, // Schedules the specified command. This method takes ownership of the // command. - virtual void ScheduleCommand(SessionCommand* command); + virtual void ScheduleCommand(SessionCommand* command) OVERRIDE; // Converts all pending tab/window closes to commands and schedules them. void CommitPendingCloses(); diff --git a/chrome/browser/sessions/session_service_factory.h b/chrome/browser/sessions/session_service_factory.h index eb46e653..ed7b14b 100644 --- a/chrome/browser/sessions/session_service_factory.h +++ b/chrome/browser/sessions/session_service_factory.h @@ -54,9 +54,10 @@ class SessionServiceFactory : public ProfileKeyedServiceFactory { virtual ~SessionServiceFactory(); // ProfileKeyedServiceFactory: - virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile) const; - virtual bool ServiceIsCreatedWithProfile(); - virtual bool ServiceIsNULLWhileTesting(); + virtual ProfileKeyedService* BuildServiceInstanceFor( + Profile* profile) const OVERRIDE; + virtual bool ServiceIsCreatedWithProfile() OVERRIDE; + virtual bool ServiceIsNULLWhileTesting() OVERRIDE; }; #endif // CHROME_BROWSER_SESSIONS_SESSION_SERVICE_FACTORY_H_ diff --git a/chrome/browser/sessions/tab_restore_service.h b/chrome/browser/sessions/tab_restore_service.h index 714e83e..bdd5f6a 100644 --- a/chrome/browser/sessions/tab_restore_service.h +++ b/chrome/browser/sessions/tab_restore_service.h @@ -171,7 +171,7 @@ class TabRestoreService : public BaseSessionService { std::vector* entries); protected: - virtual void Save(); + virtual void Save() OVERRIDE; private: // Used to indicate what has loaded. diff --git a/chrome/browser/sessions/tab_restore_service_factory.h b/chrome/browser/sessions/tab_restore_service_factory.h index b46ea96..dec246c 100644 --- a/chrome/browser/sessions/tab_restore_service_factory.h +++ b/chrome/browser/sessions/tab_restore_service_factory.h @@ -29,8 +29,9 @@ class TabRestoreServiceFactory : public ProfileKeyedServiceFactory { virtual ~TabRestoreServiceFactory(); // ProfileKeyedServiceFactory: - virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile) const; - virtual bool ServiceIsNULLWhileTesting(); + virtual ProfileKeyedService* BuildServiceInstanceFor( + Profile* profile) const OVERRIDE; + virtual bool ServiceIsNULLWhileTesting() OVERRIDE; }; #endif // CHROME_BROWSER_SESSIONS_TAB_RESTORE_SERVICE_FACTORY_H_ diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h index 0ef4194..d06e0be 100644 --- a/chrome/browser/shell_integration.h +++ b/chrome/browser/shell_integration.h @@ -242,10 +242,10 @@ class ShellIntegration { virtual ~DefaultBrowserWorker() {} // Check if Chrome is the default browser. - virtual DefaultWebClientState CheckIsDefault(); + virtual DefaultWebClientState CheckIsDefault() OVERRIDE; // Set Chrome as the default browser. - virtual void SetAsDefault(); + virtual void SetAsDefault() OVERRIDE; DISALLOW_COPY_AND_ASSIGN(DefaultBrowserWorker); }; @@ -266,10 +266,10 @@ class ShellIntegration { private: // Check is Chrome is the default handler for this protocol. - virtual DefaultWebClientState CheckIsDefault(); + virtual DefaultWebClientState CheckIsDefault() OVERRIDE; // Set Chrome as the default handler for this protocol. - virtual void SetAsDefault(); + virtual void SetAsDefault() OVERRIDE; std::string protocol_; diff --git a/chrome/browser/sidebar/sidebar_manager.h b/chrome/browser/sidebar/sidebar_manager.h index 1f2686c..ea44564 100644 --- a/chrome/browser/sidebar/sidebar_manager.h +++ b/chrome/browser/sidebar/sidebar_manager.h @@ -99,10 +99,10 @@ class SidebarManager : public content::NotificationObserver, // Overridden from content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Overridden from SidebarContainer::Delegate. - virtual void UpdateSidebar(SidebarContainer* host); + virtual void UpdateSidebar(SidebarContainer* host) OVERRIDE; // Hides all sidebars registered for |tab|. void HideAllSidebars(TabContents* tab); diff --git a/chrome/browser/speech/speech_input_bubble.h b/chrome/browser/speech/speech_input_bubble.h index 8af12c9..644e995 100644 --- a/chrome/browser/speech/speech_input_bubble.h +++ b/chrome/browser/speech/speech_input_bubble.h @@ -133,12 +133,12 @@ class SpeechInputBubbleBase : public SpeechInputBubble { virtual ~SpeechInputBubbleBase(); // SpeechInputBubble methods - virtual void SetWarmUpMode(); - virtual void SetRecordingMode(); - virtual void SetRecognizingMode(); - virtual void SetMessage(const string16& text); - virtual void SetInputVolume(float volume, float noise_volume); - virtual TabContents* tab_contents(); + virtual void SetWarmUpMode() OVERRIDE; + virtual void SetRecordingMode() OVERRIDE; + virtual void SetRecognizingMode() OVERRIDE; + virtual void SetMessage(const string16& text) OVERRIDE; + virtual void SetInputVolume(float volume, float noise_volume) OVERRIDE; + virtual TabContents* tab_contents() OVERRIDE; protected: // Updates the platform specific UI layout for the current display mode. diff --git a/chrome/browser/speech/speech_input_bubble_controller.h b/chrome/browser/speech/speech_input_bubble_controller.h index b0f1baf..39a0293 100644 --- a/chrome/browser/speech/speech_input_bubble_controller.h +++ b/chrome/browser/speech/speech_input_bubble_controller.h @@ -80,13 +80,14 @@ class SpeechInputBubbleController void CloseBubble(int caller_id); // SpeechInputBubble::Delegate methods. - virtual void InfoBubbleButtonClicked(SpeechInputBubble::Button button); - virtual void InfoBubbleFocusChanged(); + virtual void InfoBubbleButtonClicked( + SpeechInputBubble::Button button) OVERRIDE; + virtual void InfoBubbleFocusChanged() OVERRIDE; // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; private: // The various calls received by this object and handled in the UI thread. diff --git a/chrome/browser/spellchecker/spellcheck_host_impl.h b/chrome/browser/spellchecker/spellcheck_host_impl.h index 4ff371d..a4c3019 100644 --- a/chrome/browser/spellchecker/spellcheck_host_impl.h +++ b/chrome/browser/spellchecker/spellcheck_host_impl.h @@ -101,19 +101,19 @@ class SpellCheckHostImpl : public SpellCheckHost, // Returns a metrics counter associated with this object, // or null when metrics recording is disabled. - virtual SpellCheckHostMetrics* GetMetrics() const; + virtual SpellCheckHostMetrics* GetMetrics() const OVERRIDE; // Returns true if the dictionary is ready to use. - virtual bool IsReady() const; + virtual bool IsReady() const OVERRIDE; // content::URLFetcherDelegate implementation. Called when we finish // downloading the spellcheck dictionary; saves the dictionary to |data_|. - virtual void OnURLFetchComplete(const content::URLFetcher* source); + virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE; // NotificationProfile implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Saves |data_| to disk. Run on the file thread. void SaveDictionaryData(); diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.h b/chrome/browser/spellchecker/spellcheck_message_filter.h index cfa9424..2c0f2ae 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter.h +++ b/chrome/browser/spellchecker/spellcheck_message_filter.h @@ -15,10 +15,11 @@ class SpellCheckMessageFilter : public BrowserMessageFilter { virtual ~SpellCheckMessageFilter(); // BrowserMessageFilter implementation. - virtual void OverrideThreadForMessage(const IPC::Message& message, - content::BrowserThread::ID* thread); + virtual void OverrideThreadForMessage( + const IPC::Message& message, + content::BrowserThread::ID* thread) OVERRIDE; virtual bool OnMessageReceived(const IPC::Message& message, - bool* message_was_ok); + bool* message_was_ok) OVERRIDE; private: void OnPlatformCheckSpelling(const string16& word, int tag, bool* correct); diff --git a/chrome/browser/ssl/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h index 5ae28cc..5a3494b 100644 --- a/chrome/browser/ssl/ssl_blocking_page.h +++ b/chrome/browser/ssl/ssl_blocking_page.h @@ -39,11 +39,11 @@ class SSLBlockingPage : public ChromeInterstitialPage { protected: // ChromeInterstitialPage implementation. - virtual std::string GetHTMLContents(); - virtual void CommandReceived(const std::string& command); - virtual void UpdateEntry(NavigationEntry* entry); - virtual void Proceed(); - virtual void DontProceed(); + virtual std::string GetHTMLContents() OVERRIDE; + virtual void CommandReceived(const std::string& command) OVERRIDE; + virtual void UpdateEntry(NavigationEntry* entry) OVERRIDE; + virtual void Proceed() OVERRIDE; + virtual void DontProceed() OVERRIDE; private: void NotifyDenyCertificate(); diff --git a/chrome/browser/tab_contents/background_contents.h b/chrome/browser/tab_contents/background_contents.h index fc3a443..05900c0 100644 --- a/chrome/browser/tab_contents/background_contents.h +++ b/chrome/browser/tab_contents/background_contents.h @@ -56,7 +56,7 @@ class BackgroundContents : public TabContentsDelegate, // content::NotificationObserver virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; protected: // Exposed for testing. diff --git a/chrome/browser/tab_contents/chrome_interstitial_page.h b/chrome/browser/tab_contents/chrome_interstitial_page.h index 4fd3e54..8883129 100644 --- a/chrome/browser/tab_contents/chrome_interstitial_page.h +++ b/chrome/browser/tab_contents/chrome_interstitial_page.h @@ -25,13 +25,13 @@ class ChromeInterstitialPage : public InterstitialPage { virtual ~ChromeInterstitialPage(); // Shows the interstitial page in the tab. - virtual void Show(); + virtual void Show() OVERRIDE; protected: // content::NotificationObserver method: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Invoked when the page sent a command through DOMAutomation. virtual void CommandReceived(const std::string& command) {} diff --git a/chrome/browser/tab_contents/insecure_content_infobar_delegate.h b/chrome/browser/tab_contents/insecure_content_infobar_delegate.h index 08ec1c6..b137e86 100644 --- a/chrome/browser/tab_contents/insecure_content_infobar_delegate.h +++ b/chrome/browser/tab_contents/insecure_content_infobar_delegate.h @@ -40,7 +40,7 @@ class InsecureContentInfoBarDelegate : public ConfirmInfoBarDelegate { virtual void InfoBarDismissed() OVERRIDE; virtual InsecureContentInfoBarDelegate* AsInsecureContentInfoBarDelegate() OVERRIDE; - virtual string16 GetMessageText() const; + virtual string16 GetMessageText() const OVERRIDE; virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE; virtual bool Accept() OVERRIDE; virtual bool Cancel() OVERRIDE; diff --git a/chrome/browser/tab_contents/render_view_context_menu_mac.h b/chrome/browser/tab_contents/render_view_context_menu_mac.h index 56cd2d9..c4bd656 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_mac.h +++ b/chrome/browser/tab_contents/render_view_context_menu_mac.h @@ -23,7 +23,7 @@ class RenderViewContextMenuMac : public RenderViewContextMenu { const ContextMenuParams& params, NSView* parent_view); virtual ~RenderViewContextMenuMac(); - virtual void ExecuteCommand(int id); + virtual void ExecuteCommand(int id) OVERRIDE; // RenderViewContextMenuDelegate implementation. virtual void UpdateMenuItem(int command_id, @@ -32,13 +32,13 @@ class RenderViewContextMenuMac : public RenderViewContextMenu { const string16& title) OVERRIDE; protected: - // RenderViewContextMenu implementation- - virtual void PlatformInit(); + // RenderViewContextMenu implementation. + virtual void PlatformInit() OVERRIDE; virtual bool GetAcceleratorForCommandId( int command_id, - ui::Accelerator* accelerator); + ui::Accelerator* accelerator) OVERRIDE; - virtual void LookUpInDictionary(); + virtual void LookUpInDictionary() OVERRIDE; void InitPlatformMenu(); private: diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.h b/chrome/browser/tab_contents/tab_contents_view_mac.h index bc3b595..0dc7307 100644 --- a/chrome/browser/tab_contents/tab_contents_view_mac.h +++ b/chrome/browser/tab_contents/tab_contents_view_mac.h @@ -88,29 +88,31 @@ class TabContentsViewMac : public TabContentsView { // Backend implementation of RenderViewHostDelegate::View. virtual void CreateNewWindow( int route_id, - const ViewHostMsg_CreateWindow_Params& params); - virtual void CreateNewWidget(int route_id, WebKit::WebPopupType popup_type); - virtual void CreateNewFullscreenWidget(int route_id); + const ViewHostMsg_CreateWindow_Params& params) OVERRIDE; + virtual void CreateNewWidget(int route_id, + WebKit::WebPopupType popup_type) OVERRIDE; + virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE; virtual void ShowCreatedWindow(int route_id, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, - bool user_gesture); - virtual void ShowCreatedWidget(int route_id, const gfx::Rect& initial_pos); - virtual void ShowCreatedFullscreenWidget(int route_id); - virtual void ShowContextMenu(const ContextMenuParams& params); + bool user_gesture) OVERRIDE; + virtual void ShowCreatedWidget(int route_id, + const gfx::Rect& initial_pos) OVERRIDE; + virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE; + virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE; virtual void ShowPopupMenu(const gfx::Rect& bounds, int item_height, double item_font_size, int selected_item, const std::vector& items, - bool right_aligned); + bool right_aligned) OVERRIDE; virtual void StartDragging(const WebDropData& drop_data, WebKit::WebDragOperationsMask allowed_operations, const SkBitmap& image, - const gfx::Point& image_offset); - virtual void UpdateDragCursor(WebKit::WebDragOperation operation); - virtual void GotFocus(); - virtual void TakeFocus(bool reverse); + const gfx::Point& image_offset) OVERRIDE; + virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE; + virtual void GotFocus() OVERRIDE; + virtual void TakeFocus(bool reverse) OVERRIDE; // A helper method for closing the tab in the // CloseTabAfterEventTracking() implementation. diff --git a/chrome/browser/tab_contents/thumbnail_generator.h b/chrome/browser/tab_contents/thumbnail_generator.h index c05f670..dc41c3f 100644 --- a/chrome/browser/tab_contents/thumbnail_generator.h +++ b/chrome/browser/tab_contents/thumbnail_generator.h @@ -124,8 +124,8 @@ class ThumbnailGenerator : public content::NotificationObserver, const GURL& url); // TabContentsObserver overrides. - virtual void DidStartLoading(); - virtual void StopNavigation(); + virtual void DidStartLoading() OVERRIDE; + virtual void StopNavigation() OVERRIDE; private: virtual void WidgetDidReceivePaintAtSizeAck( @@ -136,7 +136,7 @@ class ThumbnailGenerator : public content::NotificationObserver, // content::NotificationObserver interface. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Indicates that the given widget has changed is visibility. void WidgetHidden(RenderWidgetHost* widget); diff --git a/chrome/browser/tabs/default_tab_handler.h b/chrome/browser/tabs/default_tab_handler.h index cc279ad..6ce3722 100644 --- a/chrome/browser/tabs/default_tab_handler.h +++ b/chrome/browser/tabs/default_tab_handler.h @@ -24,59 +24,62 @@ class DefaultTabHandler : public TabHandler, virtual ~DefaultTabHandler(); // Overridden from TabHandler: - virtual TabStripModel* GetTabStripModel() const; + virtual TabStripModel* GetTabStripModel() const OVERRIDE; // Overridden from TabStripModelDelegate: - virtual TabContentsWrapper* AddBlankTab(bool foreground); - virtual TabContentsWrapper* AddBlankTabAt(int index, bool foreground); + virtual TabContentsWrapper* AddBlankTab(bool foreground) OVERRIDE; + virtual TabContentsWrapper* AddBlankTabAt(int index, + bool foreground) OVERRIDE; virtual Browser* CreateNewStripWithContents( TabContentsWrapper* detached_contents, const gfx::Rect& window_bounds, const DockInfo& dock_info, - bool maximize); - virtual int GetDragActions() const; + bool maximize) OVERRIDE; + virtual int GetDragActions() const OVERRIDE; virtual TabContentsWrapper* CreateTabContentsForURL( const GURL& url, const GURL& referrer, Profile* profile, content::PageTransition transition, bool defer_load, - SiteInstance* instance) const; - virtual bool CanDuplicateContentsAt(int index); - virtual void DuplicateContentsAt(int index); - virtual void CloseFrameAfterDragSession(); - virtual void CreateHistoricalTab(TabContentsWrapper* contents); - virtual bool RunUnloadListenerBeforeClosing(TabContentsWrapper* contents); - virtual bool CanCloseContents(std::vector* indices); - virtual bool CanBookmarkAllTabs() const; - virtual void BookmarkAllTabs(); - virtual bool CanCloseTab() const; - virtual bool CanRestoreTab(); - virtual void RestoreTab(); - virtual bool LargeIconsPermitted() const; + SiteInstance* instance) const OVERRIDE; + virtual bool CanDuplicateContentsAt(int index) OVERRIDE; + virtual void DuplicateContentsAt(int index) OVERRIDE; + virtual void CloseFrameAfterDragSession() OVERRIDE; + virtual void CreateHistoricalTab(TabContentsWrapper* contents) OVERRIDE; + virtual bool RunUnloadListenerBeforeClosing( + TabContentsWrapper* contents) OVERRIDE; + virtual bool CanCloseContents(std::vector* indices) OVERRIDE; + virtual bool CanBookmarkAllTabs() const OVERRIDE; + virtual void BookmarkAllTabs() OVERRIDE; + virtual bool CanCloseTab() const OVERRIDE; + virtual bool CanRestoreTab() OVERRIDE; + virtual void RestoreTab() OVERRIDE; + virtual bool LargeIconsPermitted() const OVERRIDE; // 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); - virtual void TabDeactivated(TabContentsWrapper* contents); + int index) OVERRIDE; + virtual void TabDetachedAt(TabContentsWrapper* contents, int index) OVERRIDE; + virtual void TabDeactivated(TabContentsWrapper* contents) 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 TabReplacedAt(TabStripModel* tab_strip_model, TabContentsWrapper* old_contents, TabContentsWrapper* new_contents, - int index); - virtual void TabPinnedStateChanged(TabContentsWrapper* contents, int index); - virtual void TabStripEmpty(); + int index) OVERRIDE; + virtual void TabPinnedStateChanged(TabContentsWrapper* contents, + int index) OVERRIDE; + virtual void TabStripEmpty() OVERRIDE; private: TabHandlerDelegate* delegate_; diff --git a/chrome/browser/tabs/pinned_tab_service.h b/chrome/browser/tabs/pinned_tab_service.h index c4b528b..2d6f6b0 100644 --- a/chrome/browser/tabs/pinned_tab_service.h +++ b/chrome/browser/tabs/pinned_tab_service.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_TABS_PINNED_TAB_SERVICE_H_ #pragma once +#include "base/compiler_specific.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -27,7 +28,7 @@ class PinnedTabService : public content::NotificationObserver, // content::NotificationObserver. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; Profile* profile_; diff --git a/chrome/browser/tabs/tab_strip_model.h b/chrome/browser/tabs/tab_strip_model.h index 5a7a89e..f778617 100644 --- a/chrome/browser/tabs/tab_strip_model.h +++ b/chrome/browser/tabs/tab_strip_model.h @@ -472,7 +472,7 @@ class TabStripModel : public content::NotificationObserver { // Overridden from content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Convert a ContextMenuCommand into a browser command. Returns true if a // corresponding browser command exists, false otherwise. diff --git a/chrome/browser/tabs/tab_strip_model_order_controller.h b/chrome/browser/tabs/tab_strip_model_order_controller.h index b62053b..d43d737 100644 --- a/chrome/browser/tabs/tab_strip_model_order_controller.h +++ b/chrome/browser/tabs/tab_strip_model_order_controller.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. @@ -46,7 +46,7 @@ class TabStripModelOrderController : public TabStripModelObserver { virtual void ActiveTabChanged(TabContentsWrapper* old_contents, TabContentsWrapper* new_contents, int index, - bool user_gesture); + bool user_gesture) OVERRIDE; private: // Returns a valid index to be selected after the tab at |removing_index| is diff --git a/chrome/browser/task_manager/task_manager_resource_providers.h b/chrome/browser/task_manager/task_manager_resource_providers.h index ab8eba9..e52cadf 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.h +++ b/chrome/browser/task_manager/task_manager_resource_providers.h @@ -54,18 +54,18 @@ class TaskManagerRendererResource : public TaskManager::Resource { virtual void Inspect() const OVERRIDE; // RenderResources always provide the network usage. - virtual bool SupportNetworkUsage() const; - virtual void SetSupportNetworkUsage() { } + virtual bool SupportNetworkUsage() const OVERRIDE; + virtual void SetSupportNetworkUsage() OVERRIDE { } - virtual void Refresh(); + virtual void Refresh() OVERRIDE; virtual void NotifyResourceTypeStats( - const WebKit::WebCache::ResourceTypeStats& stats); + const WebKit::WebCache::ResourceTypeStats& stats) OVERRIDE; - virtual void NotifyFPS(float fps); + virtual void NotifyFPS(float fps) OVERRIDE; virtual void NotifyV8HeapStats(size_t v8_memory_allocated, - size_t v8_memory_used); + size_t v8_memory_used) OVERRIDE; private: base::ProcessHandle process_; @@ -125,14 +125,14 @@ class TaskManagerTabContentsResourceProvider virtual TaskManager::Resource* GetResource(int origin_pid, int render_process_host_id, - int routing_id); - virtual void StartUpdating(); - virtual void StopUpdating(); + int routing_id) OVERRIDE; + virtual void StartUpdating() OVERRIDE; + virtual void StopUpdating() OVERRIDE; // content::NotificationObserver method: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; private: virtual ~TaskManagerTabContentsResourceProvider(); @@ -195,14 +195,14 @@ class TaskManagerBackgroundContentsResourceProvider virtual TaskManager::Resource* GetResource(int origin_pid, int render_process_host_id, - int routing_id); - virtual void StartUpdating(); - virtual void StopUpdating(); + int routing_id) OVERRIDE; + virtual void StartUpdating() OVERRIDE; + virtual void StopUpdating() OVERRIDE; // content::NotificationObserver method: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; private: virtual ~TaskManagerBackgroundContentsResourceProvider(); @@ -274,14 +274,14 @@ class TaskManagerChildProcessResourceProvider virtual TaskManager::Resource* GetResource(int origin_pid, int render_process_host_id, - int routing_id); - virtual void StartUpdating(); - virtual void StopUpdating(); + int routing_id) OVERRIDE; + virtual void StartUpdating() OVERRIDE; + virtual void StopUpdating() OVERRIDE; // content::NotificationObserver method: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Retrieves the current ChildProcessInfo (performed in the IO thread). virtual void RetrieveChildProcessInfo(); @@ -341,7 +341,7 @@ class TaskManagerExtensionProcessResource : public TaskManager::Resource { int process_id() const { return pid_; } // Returns true if the associated extension has a background page. - virtual bool IsBackground() const; + virtual bool IsBackground() const OVERRIDE; private: // The icon painted for the extension process. @@ -366,14 +366,14 @@ class TaskManagerExtensionProcessResourceProvider virtual TaskManager::Resource* GetResource(int origin_pid, int render_process_host_id, - int routing_id); - virtual void StartUpdating(); - virtual void StopUpdating(); + int routing_id) OVERRIDE; + virtual void StartUpdating() OVERRIDE; + virtual void StopUpdating() OVERRIDE; // content::NotificationObserver method: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; private: virtual ~TaskManagerExtensionProcessResourceProvider(); @@ -439,14 +439,14 @@ class TaskManagerNotificationResourceProvider // TaskManager::ResourceProvider interface virtual TaskManager::Resource* GetResource(int origin_pid, int render_process_host_id, - int routing_id); - virtual void StartUpdating(); - virtual void StopUpdating(); + int routing_id) OVERRIDE; + virtual void StartUpdating() OVERRIDE; + virtual void StopUpdating() OVERRIDE; // content::NotificationObserver interface virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; private: explicit TaskManagerNotificationResourceProvider(TaskManager* task_manager); @@ -507,9 +507,9 @@ class TaskManagerBrowserProcessResourceProvider virtual TaskManager::Resource* GetResource(int origin_pid, int render_process_host_id, - int routing_id); - virtual void StartUpdating(); - virtual void StopUpdating(); + int routing_id) OVERRIDE; + virtual void StartUpdating() OVERRIDE; + virtual void StopUpdating() OVERRIDE; // Whether we are currently reporting to the task manager. Used to ignore // notifications sent after StopUpdating(). diff --git a/chrome/browser/task_manager/task_manager_worker_resource_provider.h b/chrome/browser/task_manager/task_manager_worker_resource_provider.h index 990e3668..0e7d5f4 100644 --- a/chrome/browser/task_manager/task_manager_worker_resource_provider.h +++ b/chrome/browser/task_manager/task_manager_worker_resource_provider.h @@ -35,9 +35,9 @@ class TaskManagerWorkerResourceProvider // TaskManager::ResourceProvider implementation. virtual TaskManager::Resource* GetResource(int origin_pid, int render_process_host_id, - int routing_id); - virtual void StartUpdating(); - virtual void StopUpdating(); + int routing_id) OVERRIDE; + virtual void StartUpdating() OVERRIDE; + virtual void StopUpdating() OVERRIDE; // WorkerServiceObserver implementation. virtual void WorkerCreated( @@ -51,7 +51,7 @@ class TaskManagerWorkerResourceProvider // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; void NotifyWorkerCreated(WorkerResourceHolder* resource_holder); void NotifyWorkerDestroyed(int process_id, int routing_id); diff --git a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h index 6dc8913..224d7b8 100644 --- a/chrome/browser/themes/theme_service.h +++ b/chrome/browser/themes/theme_service.h @@ -140,24 +140,25 @@ class ThemeService : public base::NonThreadSafe, } Tiling; // ui::ThemeProvider implementation. - 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 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; #if defined(TOOLKIT_USES_GTK) // GdkPixbufs returned by GetPixbufNamed and GetRTLEnabledPixbufNamed are // shared instances owned by the theme provider and should not be freed. - virtual GdkPixbuf* GetPixbufNamed(int id) const; - virtual GdkPixbuf* GetRTLEnabledPixbufNamed(int id) const; + virtual GdkPixbuf* GetPixbufNamed(int id) const OVERRIDE; + virtual GdkPixbuf* GetRTLEnabledPixbufNamed(int id) const OVERRIDE; #elif defined(OS_MACOSX) - 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 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; #endif // Set the current theme to the theme defined in |extension|. @@ -251,7 +252,7 @@ class ThemeService : public base::NonThreadSafe, // content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; private: friend class ThemeServiceTest; diff --git a/chrome/browser/themes/theme_service_factory.h b/chrome/browser/themes/theme_service_factory.h index 33e903e..9d9c617 100644 --- a/chrome/browser/themes/theme_service_factory.h +++ b/chrome/browser/themes/theme_service_factory.h @@ -37,8 +37,9 @@ class ThemeServiceFactory : public ProfileKeyedServiceFactory { virtual ~ThemeServiceFactory(); // ProfileKeyedServiceFactory: - virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile) const; - virtual bool ServiceRedirectedInIncognito(); + virtual ProfileKeyedService* BuildServiceInstanceFor( + Profile* profile) const OVERRIDE; + virtual bool ServiceRedirectedInIncognito() OVERRIDE; DISALLOW_COPY_AND_ASSIGN(ThemeServiceFactory); }; diff --git a/chrome/browser/translate/languages_menu_model.h b/chrome/browser/translate/languages_menu_model.h index 74a16a0..a426543 100644 --- a/chrome/browser/translate/languages_menu_model.h +++ b/chrome/browser/translate/languages_menu_model.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. @@ -24,11 +24,12 @@ class LanguagesMenuModel : public ui::SimpleMenuModel, virtual ~LanguagesMenuModel(); // ui::SimpleMenuModel::Delegate implementation: - virtual bool IsCommandIdChecked(int command_id) const; - virtual bool IsCommandIdEnabled(int command_id) const; - virtual bool GetAcceleratorForCommandId(int command_id, - ui::Accelerator* accelerator); - virtual void ExecuteCommand(int command_id); + virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; + virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool GetAcceleratorForCommandId( + int command_id, + ui::Accelerator* accelerator) OVERRIDE; + virtual void ExecuteCommand(int command_id) OVERRIDE; private: TranslateInfoBarDelegate* translate_infobar_delegate_; diff --git a/chrome/browser/translate/options_menu_model.h b/chrome/browser/translate/options_menu_model.h index 83f0f4e..308f717 100644 --- a/chrome/browser/translate/options_menu_model.h +++ b/chrome/browser/translate/options_menu_model.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. @@ -19,11 +19,12 @@ class OptionsMenuModel : public ui::SimpleMenuModel, virtual ~OptionsMenuModel(); // ui::SimpleMenuModel::Delegate implementation: - virtual bool IsCommandIdChecked(int command_id) const; - virtual bool IsCommandIdEnabled(int command_id) const; - virtual bool GetAcceleratorForCommandId(int command_id, - ui::Accelerator* accelerator); - virtual void ExecuteCommand(int command_id); + virtual bool IsCommandIdChecked(int command_id) const OVERRIDE; + virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE; + virtual bool GetAcceleratorForCommandId( + int command_id, + ui::Accelerator* accelerator) OVERRIDE; + virtual void ExecuteCommand(int command_id) OVERRIDE; private: TranslateInfoBarDelegate* translate_infobar_delegate_; diff --git a/chrome/browser/translate/translate_manager.h b/chrome/browser/translate/translate_manager.h index 85788dd..60dcb1c 100644 --- a/chrome/browser/translate/translate_manager.h +++ b/chrome/browser/translate/translate_manager.h @@ -72,10 +72,10 @@ class TranslateManager : public content::NotificationObserver, // content::NotificationObserver implementation: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // content::URLFetcherDelegate implementation: - virtual void OnURLFetchComplete(const content::URLFetcher* source); + virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE; // Used by unit-tests to override the default delay after which the translate // script is fetched again from the translation server. diff --git a/chrome/browser/transport_security_persister.h b/chrome/browser/transport_security_persister.h index 4903a88..043323a 100644 --- a/chrome/browser/transport_security_persister.h +++ b/chrome/browser/transport_security_persister.h @@ -53,10 +53,10 @@ class TransportSecurityPersister virtual ~TransportSecurityPersister(); // Called by the TransportSecurityState when it changes its state. - virtual void StateIsDirty(net::TransportSecurityState*); + virtual void StateIsDirty(net::TransportSecurityState*) OVERRIDE; // ImportantFileWriter::DataSerializer: - virtual bool SerializeData(std::string* data); + virtual bool SerializeData(std::string* data) OVERRIDE; private: class Loader; diff --git a/chrome/browser/ui/blocked_content/blocked_content_container.h b/chrome/browser/ui/blocked_content/blocked_content_container.h index c6a261e..cc92f27 100644 --- a/chrome/browser/ui/blocked_content/blocked_content_container.h +++ b/chrome/browser/ui/blocked_content/blocked_content_container.h @@ -65,25 +65,26 @@ class BlockedContentContainer : public BlockedContentTabHelperDelegate, WindowOpenDisposition disposition, content::PageTransition transition) OVERRIDE; virtual TabContents* OpenURLFromTab(TabContents* source, - const OpenURLParams& params); + const OpenURLParams& params) OVERRIDE; // Forwards AddNewContents to our |owner_|. virtual void AddNewContents(TabContents* source, TabContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_position, - bool user_gesture); + bool user_gesture) OVERRIDE; // Removes |source| from our internal list of blocked contents. - virtual void CloseContents(TabContents* source); + virtual void CloseContents(TabContents* source) OVERRIDE; // Changes the opening rectangle associated with |source|. - virtual void MoveContents(TabContents* source, const gfx::Rect& new_bounds); + virtual void MoveContents(TabContents* source, + const gfx::Rect& new_bounds) OVERRIDE; virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE; // Always returns true. - virtual bool ShouldSuppressDialogs(); + virtual bool ShouldSuppressDialogs() OVERRIDE; // Maximum number of blocked contents we allow. No page should really need // this many anyway. If reached it typically means there is a compromised diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 6b3495a..59dcf66 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -764,11 +764,11 @@ class Browser : public TabHandlerDelegate, virtual TabContents* OpenURL(const OpenURLParams& params) OVERRIDE; // Overridden from CommandUpdater::CommandUpdaterDelegate: - virtual void ExecuteCommand(int id); + virtual void ExecuteCommand(int id) OVERRIDE; // Overridden from TabRestoreServiceObserver: - virtual void TabRestoreServiceChanged(TabRestoreService* service); - virtual void TabRestoreServiceDestroyed(TabRestoreService* service); + virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE; + virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE; // Centralized method for creating a TabContents, configuring and installing // all its supporting objects and observers. @@ -780,8 +780,8 @@ class Browser : public TabHandlerDelegate, SessionStorageNamespace* session_storage_namespace); // Overridden from TabHandlerDelegate: - virtual Profile* GetProfile() const; - virtual Browser* AsBrowser(); + virtual Profile* GetProfile() const OVERRIDE; + virtual Browser* AsBrowser() OVERRIDE; // Overridden from TabStripModelDelegate: virtual TabContentsWrapper* AddBlankTab(bool foreground); @@ -938,7 +938,7 @@ class Browser : public TabHandlerDelegate, virtual void MoveContents(TabContents* source, const gfx::Rect& pos) OVERRIDE; virtual void DetachContents(TabContents* source) OVERRIDE; virtual bool IsPopupOrPanel(const TabContents* source) const OVERRIDE; - virtual bool CanReloadContents(TabContents* source) const; + virtual bool CanReloadContents(TabContents* source) const OVERRIDE; virtual void UpdateTargetURL(TabContents* source, int32 page_id, const GURL& url) OVERRIDE; virtual void ContentsMouseEvent( @@ -1053,15 +1053,17 @@ class Browser : public TabHandlerDelegate, bool starred) OVERRIDE; // Overridden from SelectFileDialog::Listener: - virtual void FileSelected(const FilePath& path, int index, void* params); + virtual void FileSelected(const FilePath& path, + int index, + void* params) OVERRIDE; // Overridden from content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Overridden from ProfileSyncServiceObserver: - virtual void OnStateChanged(); + virtual void OnStateChanged() OVERRIDE; // Overriden from InstantDelegate: virtual void ShowInstant(TabContentsWrapper* preview_contents) OVERRIDE; diff --git a/chrome/browser/ui/browser_navigator_browsertest.h b/chrome/browser/ui/browser_navigator_browsertest.h index a729998..b931b12 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.h +++ b/chrome/browser/ui/browser_navigator_browsertest.h @@ -33,8 +33,9 @@ class BrowserNavigatorTest : public InProcessBrowserTest, void RunSuppressTest(WindowOpenDisposition disposition); // content::NotificationObserver: - virtual 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; size_t created_tab_contents_count_; }; diff --git a/chrome/browser/ui/find_bar/find_bar_controller.h b/chrome/browser/ui/find_bar/find_bar_controller.h index e9ccd3a..459b265 100644 --- a/chrome/browser/ui/find_bar/find_bar_controller.h +++ b/chrome/browser/ui/find_bar/find_bar_controller.h @@ -48,7 +48,7 @@ class FindBarController : public content::NotificationObserver { // Overridden from content::NotificationObserver: virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; FindBar* find_bar() const { return find_bar_.get(); } diff --git a/chrome/browser/ui/login/login_prompt.h b/chrome/browser/ui/login/login_prompt.h index 069153b..58d9398 100644 --- a/chrome/browser/ui/login/login_prompt.h +++ b/chrome/browser/ui/login/login_prompt.h @@ -40,7 +40,7 @@ class LoginHandler : public ResourceDispatcherHostLoginDelegate, net::URLRequest* request); // ResourceDispatcherHostLoginDelegate implementation: - virtual void OnRequestCancelled(); + virtual void OnRequestCancelled() OVERRIDE; // Initializes the underlying platform specific view. virtual void BuildViewForPasswordManager(PasswordManager* manager, @@ -71,7 +71,7 @@ class LoginHandler : public ResourceDispatcherHostLoginDelegate, // if it was waiting for the same authentication. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; // Who/where/what asked for the authentication. const net::AuthChallengeInfo* auth_info() const { return auth_info_.get(); } @@ -157,7 +157,7 @@ class LoginHandler : public ResourceDispatcherHostLoginDelegate, }; // Details to provide the content::NotificationObserver. Used by the automation -//proxy for testing. +// proxy for testing. class LoginNotificationDetails { public: explicit LoginNotificationDetails(LoginHandler* handler) diff --git a/chrome/browser/ui/search_engines/template_url_table_model.h b/chrome/browser/ui/search_engines/template_url_table_model.h index 19f01cd..b91942f 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.h +++ b/chrome/browser/ui/search_engines/template_url_table_model.h @@ -99,7 +99,7 @@ class TemplateURLTableModel : public ui::TableModel, void FaviconAvailable(ModelEntry* entry); // TemplateURLServiceObserver notification. - virtual void OnTemplateURLServiceChanged(); + virtual void OnTemplateURLServiceChanged() OVERRIDE; ui::TableModelObserver* observer_; diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.h b/chrome/browser/ui/toolbar/back_forward_menu_model.h index 7ff99bc..ef8d9fb 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.h +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h @@ -41,34 +41,36 @@ class BackForwardMenuModel : public ui::MenuModel { virtual ~BackForwardMenuModel(); // MenuModel implementation. - virtual bool HasIcons() const; + virtual bool HasIcons() const OVERRIDE; // Returns how many items the menu should show, including history items, // chapter-stops, separators and the Show Full History link. This function // uses GetHistoryItemCount() and GetChapterStopCount() internally to figure // out the total number of items to show. - virtual int GetItemCount() const; - virtual ItemType GetTypeAt(int index) const; - virtual int GetCommandIdAt(int index) const; - virtual string16 GetLabelAt(int index) const; - virtual bool IsItemDynamicAt(int index) const; + virtual int GetItemCount() const OVERRIDE; + virtual ItemType GetTypeAt(int index) const OVERRIDE; + virtual int GetCommandIdAt(int index) const OVERRIDE; + virtual string16 GetLabelAt(int index) const OVERRIDE; + virtual bool IsItemDynamicAt(int index) const OVERRIDE; virtual bool GetAcceleratorAt(int index, - ui::Accelerator* accelerator) const; - virtual bool IsItemCheckedAt(int index) const; - virtual int GetGroupIdAt(int index) const; - virtual bool GetIconAt(int index, SkBitmap* icon); - virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const; - virtual bool IsEnabledAt(int index) const; - virtual MenuModel* GetSubmenuModelAt(int index) const; - virtual void HighlightChangedTo(int index); + ui::Accelerator* accelerator) const OVERRIDE; + virtual bool IsItemCheckedAt(int index) const OVERRIDE; + virtual int GetGroupIdAt(int index) const OVERRIDE; + virtual bool GetIconAt(int index, SkBitmap* icon) OVERRIDE; + virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt( + int index) const OVERRIDE; + virtual bool IsEnabledAt(int index) const OVERRIDE; + virtual MenuModel* GetSubmenuModelAt(int index) const OVERRIDE; + virtual void HighlightChangedTo(int index) OVERRIDE; virtual void ActivatedAt(int index) OVERRIDE; virtual void ActivatedAt(int index, int event_flags) OVERRIDE; - virtual void MenuWillShow(); + virtual void MenuWillShow() OVERRIDE; // Is the item at |index| a separator? bool IsSeparator(int index) const; // Set the delegate for triggering OnIconChanged. - virtual void SetMenuModelDelegate(ui::MenuModelDelegate* menu_model_delegate); + virtual void SetMenuModelDelegate( + ui::MenuModelDelegate* menu_model_delegate) OVERRIDE; protected: ui::MenuModelDelegate* menu_model_delegate() { return menu_model_delegate_; } diff --git a/chrome/browser/ui/views/extensions/extension_dialog.h b/chrome/browser/ui/views/extensions/extension_dialog.h index d09852f..dbcdae0 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.h +++ b/chrome/browser/ui/views/extensions/extension_dialog.h @@ -67,7 +67,7 @@ class ExtensionDialog : public views::WidgetDelegate, // content::NotificationObserver overrides. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; private: // Use Show() to create instances. diff --git a/chrome/browser/user_style_sheet_watcher.h b/chrome/browser/user_style_sheet_watcher.h index 4fd0243..91b0fae 100644 --- a/chrome/browser/user_style_sheet_watcher.h +++ b/chrome/browser/user_style_sheet_watcher.h @@ -35,7 +35,7 @@ class UserStyleSheetWatcher // content::NotificationObserver interface virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; private: friend struct content::BrowserThread::DeleteOnThread< diff --git a/chrome/browser/visitedlink/visitedlink_event_listener.h b/chrome/browser/visitedlink/visitedlink_event_listener.h index fb2ffb6..9ff005b 100644 --- a/chrome/browser/visitedlink/visitedlink_event_listener.h +++ b/chrome/browser/visitedlink/visitedlink_event_listener.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. @@ -31,9 +31,9 @@ class VisitedLinkEventListener : public VisitedLinkMaster::Listener, explicit VisitedLinkEventListener(Profile* profile); virtual ~VisitedLinkEventListener(); - virtual void NewTable(base::SharedMemory* table_memory); - virtual void Add(VisitedLinkMaster::Fingerprint fingerprint); - virtual void Reset(); + virtual void NewTable(base::SharedMemory* table_memory) OVERRIDE; + virtual void Add(VisitedLinkMaster::Fingerprint fingerprint) OVERRIDE; + virtual void Reset() OVERRIDE; private: void CommitVisitedLinks(); @@ -41,7 +41,7 @@ class VisitedLinkEventListener : public VisitedLinkMaster::Listener, // content::NotificationObserver implementation. virtual void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details); + const content::NotificationDetails& details) OVERRIDE; base::OneShotTimer coalesce_timer_; VisitedLinkCommon::Fingerprints pending_visited_links_; diff --git a/chrome/browser/web_resource/gpu_blacklist_updater.h b/chrome/browser/web_resource/gpu_blacklist_updater.h index 2a2b8bb..71c852b 100644 --- a/chrome/browser/web_resource/gpu_blacklist_updater.h +++ b/chrome/browser/web_resource/gpu_blacklist_updater.h @@ -21,7 +21,7 @@ class GpuBlacklistUpdater : public WebResourceService { private: virtual ~GpuBlacklistUpdater(); - virtual void Unpack(const base::DictionaryValue& parsed_json); + virtual void Unpack(const base::DictionaryValue& parsed_json) OVERRIDE; // Initialize GpuBlacklistUpdater and schedule an auto update. static void SetupOnUIThread(); diff --git a/chrome/browser/webdata/autofill_table.h b/chrome/browser/webdata/autofill_table.h index d2958c5..4af24b2 100644 --- a/chrome/browser/webdata/autofill_table.h +++ b/chrome/browser/webdata/autofill_table.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_WEBDATA_AUTOFILL_TABLE_H_ #pragma once +#include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/string16.h" #include "chrome/browser/webdata/web_database_table.h" @@ -118,8 +119,8 @@ class AutofillTable : public WebDatabaseTable { public: AutofillTable(sql::Connection* db, sql::MetaTable* meta_table); virtual ~AutofillTable(); - virtual bool Init(); - virtual bool IsSyncable(); + virtual bool Init() OVERRIDE; + virtual bool IsSyncable() OVERRIDE; // Records the form elements in |elements| in the database in the // autofill table. A list of all added and updated autofill entries diff --git a/chrome/browser/webdata/keyword_table.h b/chrome/browser/webdata/keyword_table.h index 0767d8d..47bf5ef 100644 --- a/chrome/browser/webdata/keyword_table.h +++ b/chrome/browser/webdata/keyword_table.h @@ -8,6 +8,7 @@ #include +#include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/string16.h" #include "chrome/browser/webdata/web_database_table.h" @@ -54,8 +55,8 @@ class KeywordTable : public WebDatabaseTable { KeywordTable(sql::Connection* db, sql::MetaTable* meta_table) : WebDatabaseTable(db, meta_table) {} virtual ~KeywordTable(); - virtual bool Init(); - virtual bool IsSyncable(); + virtual bool Init() OVERRIDE; + virtual bool IsSyncable() OVERRIDE; // Adds a new keyword, updating the id field on success. // Returns true if successful. diff --git a/chrome/browser/webdata/logins_table.h b/chrome/browser/webdata/logins_table.h index db8cb98..f5ff728b 100644 --- a/chrome/browser/webdata/logins_table.h +++ b/chrome/browser/webdata/logins_table.h @@ -8,6 +8,7 @@ #include +#include "base/compiler_specific.h" #include "chrome/browser/webdata/web_database_table.h" namespace base { @@ -50,8 +51,8 @@ class LoginsTable : public WebDatabaseTable { LoginsTable(sql::Connection* db, sql::MetaTable* meta_table) : WebDatabaseTable(db, meta_table) {} virtual ~LoginsTable() {} - virtual bool Init(); - virtual bool IsSyncable(); + virtual bool Init() OVERRIDE; + virtual bool IsSyncable() OVERRIDE; // Adds |form| to the list of remembered password forms. bool AddLogin(const webkit_glue::PasswordForm& form); diff --git a/chrome/browser/webdata/token_service_table.h b/chrome/browser/webdata/token_service_table.h index ebb455a..a9ad849a 100644 --- a/chrome/browser/webdata/token_service_table.h +++ b/chrome/browser/webdata/token_service_table.h @@ -9,6 +9,7 @@ #include #include +#include "base/compiler_specific.h" #include "chrome/browser/webdata/web_database_table.h" class TokenServiceTable : public WebDatabaseTable { @@ -16,8 +17,8 @@ class TokenServiceTable : public WebDatabaseTable { TokenServiceTable(sql::Connection* db, sql::MetaTable* meta_table) : WebDatabaseTable(db, meta_table) {} virtual ~TokenServiceTable() {} - virtual bool Init(); - virtual bool IsSyncable(); + virtual bool Init() OVERRIDE; + virtual bool IsSyncable() OVERRIDE; // Remove all tokens previously set with SetTokenForService. bool RemoveAllTokens(); diff --git a/chrome/browser/webdata/web_apps_table.h b/chrome/browser/webdata/web_apps_table.h index b39ac9c..1222f5d 100644 --- a/chrome/browser/webdata/web_apps_table.h +++ b/chrome/browser/webdata/web_apps_table.h @@ -8,6 +8,7 @@ #include +#include "base/compiler_specific.h" #include "chrome/browser/webdata/web_database_table.h" class GURL; @@ -33,8 +34,8 @@ class WebAppsTable : public WebDatabaseTable { WebAppsTable(sql::Connection* db, sql::MetaTable* meta_table) : WebDatabaseTable(db, meta_table) {} virtual ~WebAppsTable() {} - virtual bool Init(); - virtual bool IsSyncable(); + virtual bool Init() OVERRIDE; + virtual bool IsSyncable() OVERRIDE; bool SetWebAppImage(const GURL& url, const SkBitmap& image); bool GetWebAppImages(const GURL& url, std::vector* images); diff --git a/chrome/browser/webdata/web_intents_table.h b/chrome/browser/webdata/web_intents_table.h index 2cd20ab..beb0c19 100644 --- a/chrome/browser/webdata/web_intents_table.h +++ b/chrome/browser/webdata/web_intents_table.h @@ -9,6 +9,7 @@ #include #include "base/basictypes.h" +#include "base/compiler_specific.h" #include "base/string16.h" #include "chrome/browser/webdata/web_database_table.h" #include "webkit/glue/web_intent_service_data.h" @@ -33,8 +34,8 @@ class WebIntentsTable : public WebDatabaseTable { virtual ~WebIntentsTable(); // WebDatabaseTable implementation. - virtual bool Init(); - virtual bool IsSyncable(); + virtual bool Init() OVERRIDE; + virtual bool IsSyncable() OVERRIDE; // Adds a web intent service to the WebIntents table. // If |service| already exists, replaces it. -- cgit v1.1