| Index: chrome/browser/metrics/chrome_metrics_service_client.h
|
| diff --git a/chrome/browser/metrics/chrome_metrics_service_client.h b/chrome/browser/metrics/chrome_metrics_service_client.h
|
| index 6f2f251af45aa6a7560e034a66451b86a29fa8e3..0ef629493e22d5045f54a00d5fcce73796783c58 100644
|
| --- a/chrome/browser/metrics/chrome_metrics_service_client.h
|
| +++ b/chrome/browser/metrics/chrome_metrics_service_client.h
|
| @@ -56,23 +56,23 @@ class ChromeMetricsServiceClient
|
| static void RegisterPrefs(PrefRegistrySimple* registry);
|
|
|
| // metrics::MetricsServiceClient:
|
| - virtual void SetMetricsClientId(const std::string& client_id) OVERRIDE;
|
| - virtual bool IsOffTheRecordSessionActive() OVERRIDE;
|
| - virtual int32 GetProduct() OVERRIDE;
|
| - virtual std::string GetApplicationLocale() OVERRIDE;
|
| - virtual bool GetBrand(std::string* brand_code) OVERRIDE;
|
| - virtual metrics::SystemProfileProto::Channel GetChannel() OVERRIDE;
|
| - virtual std::string GetVersionString() OVERRIDE;
|
| - virtual void OnLogUploadComplete() OVERRIDE;
|
| + virtual void SetMetricsClientId(const std::string& client_id) override;
|
| + virtual bool IsOffTheRecordSessionActive() override;
|
| + virtual int32 GetProduct() override;
|
| + virtual std::string GetApplicationLocale() override;
|
| + virtual bool GetBrand(std::string* brand_code) override;
|
| + virtual metrics::SystemProfileProto::Channel GetChannel() override;
|
| + virtual std::string GetVersionString() override;
|
| + virtual void OnLogUploadComplete() override;
|
| virtual void StartGatheringMetrics(
|
| - const base::Closure& done_callback) OVERRIDE;
|
| + const base::Closure& done_callback) override;
|
| virtual void CollectFinalMetrics(const base::Closure& done_callback)
|
| - OVERRIDE;
|
| + override;
|
| virtual scoped_ptr<metrics::MetricsLogUploader> CreateUploader(
|
| const std::string& server_url,
|
| const std::string& mime_type,
|
| - const base::Callback<void(int)>& on_upload_complete) OVERRIDE;
|
| - virtual base::string16 GetRegistryBackupKey() OVERRIDE;
|
| + const base::Callback<void(int)>& on_upload_complete) override;
|
| + virtual base::string16 GetRegistryBackupKey() override;
|
|
|
| metrics::MetricsService* metrics_service() { return metrics_service_.get(); }
|
|
|
| @@ -99,8 +99,8 @@ class ChromeMetricsServiceClient
|
| // TrackingSynchronizerObserver:
|
| virtual void ReceivedProfilerData(
|
| const tracked_objects::ProcessDataSnapshot& process_data,
|
| - int process_type) OVERRIDE;
|
| - virtual void FinishedReceivingProfilerData() OVERRIDE;
|
| + int process_type) override;
|
| + virtual void FinishedReceivingProfilerData() override;
|
|
|
| // Callbacks for various stages of final log info collection. Do not call
|
| // these directly.
|
| @@ -119,7 +119,7 @@ class ChromeMetricsServiceClient
|
| // content::NotificationObserver:
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| + const content::NotificationDetails& details) override;
|
|
|
| #if defined(OS_WIN)
|
| // Counts (and removes) the browser crash dump attempt signals left behind by
|
|
|