| 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 b41914fa0b94ac5ba9af469f60a882bdfffeff68..a6b23605cb97e1089c1908b4f17f32876c3fa2bb 100644
|
| --- a/chrome/browser/metrics/chrome_metrics_service_client.h
|
| +++ b/chrome/browser/metrics/chrome_metrics_service_client.h
|
| @@ -45,7 +45,7 @@ class ChromeMetricsServiceClient
|
| public metrics::TrackingSynchronizerObserver,
|
| public content::NotificationObserver {
|
| public:
|
| - virtual ~ChromeMetricsServiceClient();
|
| + ~ChromeMetricsServiceClient() override;
|
|
|
| // Factory function.
|
| static scoped_ptr<ChromeMetricsServiceClient> Create(
|
| @@ -56,23 +56,21 @@ 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 StartGatheringMetrics(
|
| - const base::Closure& done_callback) override;
|
| - virtual void CollectFinalMetrics(const base::Closure& done_callback)
|
| - override;
|
| - virtual scoped_ptr<metrics::MetricsLogUploader> CreateUploader(
|
| + void SetMetricsClientId(const std::string& client_id) override;
|
| + bool IsOffTheRecordSessionActive() override;
|
| + int32 GetProduct() override;
|
| + std::string GetApplicationLocale() override;
|
| + bool GetBrand(std::string* brand_code) override;
|
| + metrics::SystemProfileProto::Channel GetChannel() override;
|
| + std::string GetVersionString() override;
|
| + void OnLogUploadComplete() override;
|
| + void StartGatheringMetrics(const base::Closure& done_callback) override;
|
| + void CollectFinalMetrics(const base::Closure& done_callback) override;
|
| + 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;
|
| + base::string16 GetRegistryBackupKey() override;
|
|
|
| metrics::MetricsService* metrics_service() { return metrics_service_.get(); }
|
|
|
| @@ -97,10 +95,10 @@ class ChromeMetricsServiceClient
|
| void OnInitTaskGotGoogleUpdateData();
|
|
|
| // TrackingSynchronizerObserver:
|
| - virtual void ReceivedProfilerData(
|
| + void ReceivedProfilerData(
|
| const tracked_objects::ProcessDataSnapshot& process_data,
|
| int process_type) override;
|
| - virtual void FinishedReceivingProfilerData() override;
|
| + void FinishedReceivingProfilerData() override;
|
|
|
| // Callbacks for various stages of final log info collection. Do not call
|
| // these directly.
|
| @@ -117,9 +115,9 @@ class ChromeMetricsServiceClient
|
| void RegisterForNotifications();
|
|
|
| // content::NotificationObserver:
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override;
|
|
|
| #if defined(OS_WIN)
|
| // Counts (and removes) the browser crash dump attempt signals left behind by
|
|
|