summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormohan.reddy <mohan.reddy@samsung.com>2014-10-09 22:25:31 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-10 05:25:47 +0000
commit0553ad50a433772e71adda9f7060774e4eafe65e (patch)
tree3f2c3aaf510eb29831c1baf6ad772e2da3c81799
parentda30ed354c83de42e6c07b4369446b47b5cfb2cb (diff)
downloadchromium_src-0553ad50a433772e71adda9f7060774e4eafe65e.zip
chromium_src-0553ad50a433772e71adda9f7060774e4eafe65e.tar.gz
chromium_src-0553ad50a433772e71adda9f7060774e4eafe65e.tar.bz2
Replacing the OVERRIDE with override and in chrome
This step is a giant search and replace for OVERRIDE to replace them with their lowercase versions. BUG=417463 Review URL: https://codereview.chromium.org/644903002 Cr-Commit-Position: refs/heads/master@{#299062}
-rw-r--r--chrome/android/shell/chrome_main_delegate_chrome_shell_android.h2
-rw-r--r--chrome/android/shell/chrome_shell_google_location_settings_helper.h2
-rw-r--r--chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h4
-rw-r--r--chrome/app/android/chrome_main_delegate_android.h6
-rw-r--r--chrome/app/chrome_crash_reporter_client.h42
-rw-r--r--chrome/app/chrome_main_delegate.h30
-rw-r--r--chrome/app/client_util.cc4
-rw-r--r--chrome/app/delay_load_hook_unittest_win.cc2
-rw-r--r--chrome/app/signature_validator_win_unittest.cc4
-rw-r--r--chrome/app_shim/chrome_main_app_mode_mac.mm4
-rw-r--r--chrome/common/extensions/manifest_handlers/settings_overrides_handler.h4
-rw-r--r--chrome/common/extensions/manifest_handlers/ui_overrides_handler.h10
-rw-r--r--chrome/common/extensions/permissions/chrome_permission_message_provider.h8
-rw-r--r--chrome/plugin/chrome_content_plugin_client.h2
14 files changed, 62 insertions, 62 deletions
diff --git a/chrome/android/shell/chrome_main_delegate_chrome_shell_android.h b/chrome/android/shell/chrome_main_delegate_chrome_shell_android.h
index 36e2413..1bbe6b1 100644
--- a/chrome/android/shell/chrome_main_delegate_chrome_shell_android.h
+++ b/chrome/android/shell/chrome_main_delegate_chrome_shell_android.h
@@ -12,7 +12,7 @@ class ChromeMainDelegateChromeShellAndroid : public ChromeMainDelegateAndroid {
ChromeMainDelegateChromeShellAndroid();
virtual ~ChromeMainDelegateChromeShellAndroid();
- virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
+ virtual bool BasicStartupComplete(int* exit_code) override;
private:
DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateChromeShellAndroid);
diff --git a/chrome/android/shell/chrome_shell_google_location_settings_helper.h b/chrome/android/shell/chrome_shell_google_location_settings_helper.h
index e8cd206..e3e7e72 100644
--- a/chrome/android/shell/chrome_shell_google_location_settings_helper.h
+++ b/chrome/android/shell/chrome_shell_google_location_settings_helper.h
@@ -12,7 +12,7 @@ class ChromeShellGoogleLocationSettingsHelper
: public GoogleLocationSettingsHelper {
public:
// GoogleLocationSettingsHelper implementation:
- virtual bool IsSystemLocationEnabled() OVERRIDE;
+ virtual bool IsSystemLocationEnabled() override;
protected:
ChromeShellGoogleLocationSettingsHelper();
diff --git a/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h b/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h
index 1ef2b14a..6b65925 100644
--- a/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h
+++ b/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.h
@@ -13,9 +13,9 @@ class ChromeMainDelegateChromeSyncShellAndroid
ChromeMainDelegateChromeSyncShellAndroid();
virtual ~ChromeMainDelegateChromeSyncShellAndroid();
- virtual bool RegisterApplicationNativeMethods(JNIEnv* env) OVERRIDE;
+ virtual bool RegisterApplicationNativeMethods(JNIEnv* env) override;
- virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
+ virtual bool BasicStartupComplete(int* exit_code) override;
private:
DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateChromeSyncShellAndroid);
diff --git a/chrome/app/android/chrome_main_delegate_android.h b/chrome/app/android/chrome_main_delegate_android.h
index 8fc9f77..b268ab1 100644
--- a/chrome/app/android/chrome_main_delegate_android.h
+++ b/chrome/app/android/chrome_main_delegate_android.h
@@ -21,13 +21,13 @@ class ChromeMainDelegateAndroid : public ChromeMainDelegate {
ChromeMainDelegateAndroid();
virtual ~ChromeMainDelegateAndroid();
- virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
+ virtual bool BasicStartupComplete(int* exit_code) override;
- virtual void SandboxInitialized(const std::string& process_type) OVERRIDE;
+ virtual void SandboxInitialized(const std::string& process_type) override;
virtual int RunProcess(
const std::string& process_type,
- const content::MainFunctionParams& main_function_params) OVERRIDE;
+ const content::MainFunctionParams& main_function_params) override;
private:
scoped_ptr<content::BrowserMainRunner> browser_runner_;
diff --git a/chrome/app/chrome_crash_reporter_client.h b/chrome/app/chrome_crash_reporter_client.h
index 24a475a..ddd426b 100644
--- a/chrome/app/chrome_crash_reporter_client.h
+++ b/chrome/app/chrome_crash_reporter_client.h
@@ -18,55 +18,55 @@ class ChromeCrashReporterClient : public crash_reporter::CrashReporterClient {
// crash_reporter::CrashReporterClient implementation.
virtual void SetCrashReporterClientIdFromGUID(
- const std::string& client_guid) OVERRIDE;
+ const std::string& client_guid) override;
#if defined(OS_WIN)
virtual bool GetAlternativeCrashDumpLocation(base::FilePath* crash_dir)
- OVERRIDE;
+ override;
virtual void GetProductNameAndVersion(const base::FilePath& exe_path,
base::string16* product_name,
base::string16* version,
base::string16* special_build,
- base::string16* channel_name) OVERRIDE;
+ base::string16* channel_name) override;
virtual bool ShouldShowRestartDialog(base::string16* title,
base::string16* message,
- bool* is_rtl_locale) OVERRIDE;
- virtual bool AboutToRestart() OVERRIDE;
- virtual bool GetDeferredUploadsSupported(bool is_per_user_install) OVERRIDE;
- virtual bool GetIsPerUserInstall(const base::FilePath& exe_path) OVERRIDE;
- virtual bool GetShouldDumpLargerDumps(bool is_per_user_install) OVERRIDE;
- virtual int GetResultCodeRespawnFailed() OVERRIDE;
- virtual void InitBrowserCrashDumpsRegKey() OVERRIDE;
- virtual void RecordCrashDumpAttempt(bool is_real_crash) OVERRIDE;
+ bool* is_rtl_locale) override;
+ virtual bool AboutToRestart() override;
+ virtual bool GetDeferredUploadsSupported(bool is_per_user_install) override;
+ virtual bool GetIsPerUserInstall(const base::FilePath& exe_path) override;
+ virtual bool GetShouldDumpLargerDumps(bool is_per_user_install) override;
+ virtual int GetResultCodeRespawnFailed() override;
+ virtual void InitBrowserCrashDumpsRegKey() override;
+ virtual void RecordCrashDumpAttempt(bool is_real_crash) override;
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS)
virtual void GetProductNameAndVersion(const char** product_name,
- const char** version) OVERRIDE;
- virtual base::FilePath GetReporterLogFilename() OVERRIDE;
+ const char** version) override;
+ virtual base::FilePath GetReporterLogFilename() override;
#endif
- virtual bool GetCrashDumpLocation(base::FilePath* crash_dir) OVERRIDE;
+ virtual bool GetCrashDumpLocation(base::FilePath* crash_dir) override;
- virtual size_t RegisterCrashKeys() OVERRIDE;
+ virtual size_t RegisterCrashKeys() override;
- virtual bool IsRunningUnattended() OVERRIDE;
+ virtual bool IsRunningUnattended() override;
- virtual bool GetCollectStatsConsent() OVERRIDE;
+ virtual bool GetCollectStatsConsent() override;
#if defined(OS_WIN) || defined(OS_MACOSX)
- virtual bool ReportingIsEnforcedByPolicy(bool* breakpad_enabled) OVERRIDE;
+ virtual bool ReportingIsEnforcedByPolicy(bool* breakpad_enabled) override;
#endif
#if defined(OS_ANDROID)
- virtual int GetAndroidMinidumpDescriptor() OVERRIDE;
+ virtual int GetAndroidMinidumpDescriptor() override;
#endif
#if defined(OS_MACOSX)
- virtual void InstallAdditionalFilters(BreakpadRef breakpad) OVERRIDE;
+ virtual void InstallAdditionalFilters(BreakpadRef breakpad) override;
#endif
virtual bool EnableBreakpadForProcess(
- const std::string& process_type) OVERRIDE;
+ const std::string& process_type) override;
private:
DISALLOW_COPY_AND_ASSIGN(ChromeCrashReporterClient);
diff --git a/chrome/app/chrome_main_delegate.h b/chrome/app/chrome_main_delegate.h
index fb29051..08b7715 100644
--- a/chrome/app/chrome_main_delegate.h
+++ b/chrome/app/chrome_main_delegate.h
@@ -25,32 +25,32 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
protected:
// content::ContentMainDelegate implementation:
- virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
- virtual void PreSandboxStartup() OVERRIDE;
- virtual void SandboxInitialized(const std::string& process_type) OVERRIDE;
+ virtual bool BasicStartupComplete(int* exit_code) override;
+ virtual void PreSandboxStartup() override;
+ virtual void SandboxInitialized(const std::string& process_type) override;
virtual int RunProcess(
const std::string& process_type,
- const content::MainFunctionParams& main_function_params) OVERRIDE;
- virtual void ProcessExiting(const std::string& process_type) OVERRIDE;
+ const content::MainFunctionParams& main_function_params) override;
+ virtual void ProcessExiting(const std::string& process_type) override;
#if defined(OS_MACOSX)
virtual bool ProcessRegistersWithSystemProcess(
- const std::string& process_type) OVERRIDE;
- virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE;
+ const std::string& process_type) override;
+ virtual bool ShouldSendMachPort(const std::string& process_type) override;
virtual bool DelaySandboxInitialization(
- const std::string& process_type) OVERRIDE;
+ const std::string& process_type) override;
#elif defined(OS_POSIX) && !defined(OS_ANDROID)
virtual void ZygoteStarting(
- ScopedVector<content::ZygoteForkDelegate>* delegates) OVERRIDE;
- virtual void ZygoteForked() OVERRIDE;
+ ScopedVector<content::ZygoteForkDelegate>* delegates) override;
+ virtual void ZygoteForked() override;
#elif defined(OS_WIN)
- virtual bool ShouldEnableTerminationOnHeapCorruption() OVERRIDE;
+ virtual bool ShouldEnableTerminationOnHeapCorruption() override;
#endif
- virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
- virtual content::ContentPluginClient* CreateContentPluginClient() OVERRIDE;
+ virtual content::ContentBrowserClient* CreateContentBrowserClient() override;
+ virtual content::ContentPluginClient* CreateContentPluginClient() override;
virtual content::ContentRendererClient*
- CreateContentRendererClient() OVERRIDE;
- virtual content::ContentUtilityClient* CreateContentUtilityClient() OVERRIDE;
+ CreateContentRendererClient() override;
+ virtual content::ContentUtilityClient* CreateContentUtilityClient() override;
#if defined(OS_MACOSX)
void InitMacCrashReporter(const base::CommandLine& command_line,
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index d68229c..4dd6325 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -355,10 +355,10 @@ class ChromeDllLoader : public MainDllLoader {
class ChromiumDllLoader : public MainDllLoader {
protected:
- virtual void OnBeforeLaunch(const base::string16& dll_path) OVERRIDE {
+ virtual void OnBeforeLaunch(const base::string16& dll_path) override {
}
virtual int OnBeforeExit(int return_code,
- const base::string16& dll_path) OVERRIDE {
+ const base::string16& dll_path) override {
return return_code;
}
};
diff --git a/chrome/app/delay_load_hook_unittest_win.cc b/chrome/app/delay_load_hook_unittest_win.cc
index e599e79..1fc62d3 100644
--- a/chrome/app/delay_load_hook_unittest_win.cc
+++ b/chrome/app/delay_load_hook_unittest_win.cc
@@ -23,7 +23,7 @@ class ChromeDelayLoadHookTest : public testing::Test {
ChromeDelayLoadHookTest() : proc_ptr_(NULL) {
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
SetupInfo("kernel32.dll");
}
diff --git a/chrome/app/signature_validator_win_unittest.cc b/chrome/app/signature_validator_win_unittest.cc
index 4d3fe85..7e0b961 100644
--- a/chrome/app/signature_validator_win_unittest.cc
+++ b/chrome/app/signature_validator_win_unittest.cc
@@ -36,7 +36,7 @@ class SignatureValidatorTest : public testing::Test {
protected:
SignatureValidatorTest() {}
- void SetUp() OVERRIDE {
+ void SetUp() override {
test_roots_ = net::TestRootCerts::GetInstance();
base::FilePath cert_path =
GetTestCertsDirectory().Append(L"AuthorityCert.cer");
@@ -49,7 +49,7 @@ class SignatureValidatorTest : public testing::Test {
SetExpectedHash(GetTestCertsDirectory().Append(L"ValidCert.cer"));
}
- void TearDown() OVERRIDE {
+ void TearDown() override {
test_roots_->Clear();
EXPECT_TRUE(test_roots_->IsEmpty());
}
diff --git a/chrome/app_shim/chrome_main_app_mode_mac.mm b/chrome/app_shim/chrome_main_app_mode_mac.mm
index e9cf194..4e300ac 100644
--- a/chrome/app_shim/chrome_main_app_mode_mac.mm
+++ b/chrome/app_shim/chrome_main_app_mode_mac.mm
@@ -119,8 +119,8 @@ class AppShimController : public IPC::Listener {
private:
// IPC::Listener implemetation.
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
- virtual void OnChannelError() OVERRIDE;
+ virtual bool OnMessageReceived(const IPC::Message& message) override;
+ virtual void OnChannelError() override;
// If Chrome failed to launch the app, |success| will be false and the app
// shim process should die.
diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h
index ab39319..992a04b 100644
--- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h
+++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h
@@ -42,10 +42,10 @@ class SettingsOverridesHandler : public ManifestHandler {
SettingsOverridesHandler();
virtual ~SettingsOverridesHandler();
- virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
+ virtual bool Parse(Extension* extension, base::string16* error) override;
private:
- virtual const std::vector<std::string> Keys() const OVERRIDE;
+ virtual const std::vector<std::string> Keys() const override;
DISALLOW_COPY_AND_ASSIGN(SettingsOverridesHandler);
};
diff --git a/chrome/common/extensions/manifest_handlers/ui_overrides_handler.h b/chrome/common/extensions/manifest_handlers/ui_overrides_handler.h
index d47e720..b1ce864 100644
--- a/chrome/common/extensions/manifest_handlers/ui_overrides_handler.h
+++ b/chrome/common/extensions/manifest_handlers/ui_overrides_handler.h
@@ -39,19 +39,19 @@ class UIOverridesHandler : public ManifestHandler {
UIOverridesHandler();
virtual ~UIOverridesHandler();
- virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
+ virtual bool Parse(Extension* extension, base::string16* error) override;
virtual bool Validate(const Extension* extension,
std::string* error,
- std::vector<InstallWarning>* warnings) const OVERRIDE;
+ std::vector<InstallWarning>* warnings) const override;
- virtual ManifestPermission* CreatePermission() OVERRIDE;
+ virtual ManifestPermission* CreatePermission() override;
virtual ManifestPermission* CreateInitialRequiredPermission(
- const Extension* extension) OVERRIDE;
+ const Extension* extension) override;
private:
class ManifestPermissionImpl;
- virtual const std::vector<std::string> Keys() const OVERRIDE;
+ virtual const std::vector<std::string> Keys() const override;
DISALLOW_COPY_AND_ASSIGN(UIOverridesHandler);
};
diff --git a/chrome/common/extensions/permissions/chrome_permission_message_provider.h b/chrome/common/extensions/permissions/chrome_permission_message_provider.h
index 0509150..d52150a 100644
--- a/chrome/common/extensions/permissions/chrome_permission_message_provider.h
+++ b/chrome/common/extensions/permissions/chrome_permission_message_provider.h
@@ -28,17 +28,17 @@ class ChromePermissionMessageProvider : public PermissionMessageProvider {
// PermissionMessageProvider implementation.
virtual PermissionMessages GetPermissionMessages(
const PermissionSet* permissions,
- Manifest::Type extension_type) const OVERRIDE;
+ Manifest::Type extension_type) const override;
virtual std::vector<base::string16> GetWarningMessages(
const PermissionSet* permissions,
- Manifest::Type extension_type) const OVERRIDE;
+ Manifest::Type extension_type) const override;
virtual std::vector<base::string16> GetWarningMessagesDetails(
const PermissionSet* permissions,
- Manifest::Type extension_type) const OVERRIDE;
+ Manifest::Type extension_type) const override;
virtual bool IsPrivilegeIncrease(
const PermissionSet* old_permissions,
const PermissionSet* new_permissions,
- Manifest::Type extension_type) const OVERRIDE;
+ Manifest::Type extension_type) const override;
private:
// Gets the permission messages for the API permissions.
diff --git a/chrome/plugin/chrome_content_plugin_client.h b/chrome/plugin/chrome_content_plugin_client.h
index 0d224f6..0d717ea 100644
--- a/chrome/plugin/chrome_content_plugin_client.h
+++ b/chrome/plugin/chrome_content_plugin_client.h
@@ -12,7 +12,7 @@ namespace chrome {
class ChromeContentPluginClient : public content::ContentPluginClient {
public:
- virtual void PreSandboxInitialization() OVERRIDE;
+ virtual void PreSandboxInitialization() override;
};
} // namespace chrome