diff options
Diffstat (limited to 'chrome/browser/extensions/api/feedback_private')
4 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc index 421c94a..e9dcd87 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc @@ -31,12 +31,12 @@ namespace extensions { class FeedbackTest : public ExtensionBrowserTest { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); InProcessBrowserTest::SetUp(); } - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { + virtual void SetUpCommandLine(CommandLine* command_line) override { command_line->AppendSwitch(::switches::kEnableUserMediaScreenCapturing); InProcessBrowserTest::SetUpCommandLine(command_line); } diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.h b/chrome/browser/extensions/api/feedback_private/feedback_private_api.h index 43f4de2..d979808 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.h +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.h @@ -61,7 +61,7 @@ class FeedbackPrivateGetStringsFunction : public ChromeSyncExtensionFunction { virtual ~FeedbackPrivateGetStringsFunction() {} // SyncExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; private: static base::Closure* test_callback_; @@ -74,7 +74,7 @@ class FeedbackPrivateGetUserEmailFunction : public ChromeSyncExtensionFunction { protected: virtual ~FeedbackPrivateGetUserEmailFunction() {} - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class FeedbackPrivateGetSystemInformationFunction @@ -85,7 +85,7 @@ class FeedbackPrivateGetSystemInformationFunction protected: virtual ~FeedbackPrivateGetSystemInformationFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnCompleted( @@ -100,7 +100,7 @@ class FeedbackPrivateSendFeedbackFunction protected: virtual ~FeedbackPrivateSendFeedbackFunction() {} - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; private: void OnCompleted(bool success); diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc b/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc index 94cd0e3..0b12aecd 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_service_chromeos.cc @@ -20,12 +20,12 @@ class FeedbackServiceImpl FeedbackServiceImpl(); virtual ~FeedbackServiceImpl(); - virtual std::string GetUserEmail() OVERRIDE; - virtual void GetHistograms(std::string* histograms) OVERRIDE; + virtual std::string GetUserEmail() override; + virtual void GetHistograms(std::string* histograms) override; private: // Overridden from FeedbackService: - virtual base::WeakPtr<FeedbackService> GetWeakPtr() OVERRIDE; + virtual base::WeakPtr<FeedbackService> GetWeakPtr() override; DISALLOW_COPY_AND_ASSIGN(FeedbackServiceImpl); }; diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc b/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc index 72f8e94..e958a1b 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc @@ -20,12 +20,12 @@ class FeedbackServiceImpl FeedbackServiceImpl(); virtual ~FeedbackServiceImpl(); - virtual std::string GetUserEmail() OVERRIDE; - virtual void GetHistograms(std::string* histograms) OVERRIDE; + virtual std::string GetUserEmail() override; + virtual void GetHistograms(std::string* histograms) override; private: // Overridden from FeedbackService: - virtual base::WeakPtr<FeedbackService> GetWeakPtr() OVERRIDE; + virtual base::WeakPtr<FeedbackService> GetWeakPtr() override; DISALLOW_COPY_AND_ASSIGN(FeedbackServiceImpl); }; |