summaryrefslogtreecommitdiffstats
path: root/ios
diff options
context:
space:
mode:
authorblundell <blundell@chromium.org>2015-10-21 00:42:37 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-21 07:43:13 +0000
commit40b14cfa3f3458ae0d6f655886d952389aabc25c (patch)
treeed1153a4ae0fd930dca3699701d55ea0c01ad536 /ios
parent2d34a41c6a62b668a4a71e03298eb7d773916ae4 (diff)
downloadchromium_src-40b14cfa3f3458ae0d6f655886d952389aabc25c.zip
chromium_src-40b14cfa3f3458ae0d6f655886d952389aabc25c.tar.gz
chromium_src-40b14cfa3f3458ae0d6f655886d952389aabc25c.tar.bz2
Eliminate //chrome dependencies from MetricsServicesManager
This CL eliminates //chrome dependencies from MetricsServicesManager in preparation for componentizing that file to share with iOS. To do so, we introduce MetricsServicesManagerClient, which encapsulates the embedder information that MetricsServicesManager previously internalized. BUG=508025 TBR=thestig, droger Review URL: https://codereview.chromium.org/1411593004 Cr-Commit-Position: refs/heads/master@{#355255}
Diffstat (limited to 'ios')
-rw-r--r--ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc4
-rw-r--r--ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc
index 06a3533..f96fa35 100644
--- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc
+++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc
@@ -105,6 +105,10 @@ void IOSChromeMetricsServiceClient::RegisterPrefs(
metrics::StabilityMetricsHelper::RegisterPrefs(registry);
}
+metrics::MetricsService* IOSChromeMetricsServiceClient::GetMetricsService() {
+ return metrics_service_.get();
+}
+
void IOSChromeMetricsServiceClient::SetMetricsClientId(
const std::string& client_id) {
crash_keys::SetMetricsClientIdFromGUID(client_id);
diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h
index bc9842f..ff2bad2 100644
--- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h
+++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h
@@ -50,6 +50,7 @@ class IOSChromeMetricsServiceClient
static void RegisterPrefs(PrefRegistrySimple* registry);
// metrics::MetricsServiceClient:
+ metrics::MetricsService* GetMetricsService() override;
void SetMetricsClientId(const std::string& client_id) override;
void OnRecordingDisabled() override;
bool IsOffTheRecordSessionActive() override;
@@ -71,8 +72,6 @@ class IOSChromeMetricsServiceClient
void WebStateDidStartLoading(web::WebState* web_state) override;
void WebStateDidStopLoading(web::WebState* web_state) override;
- metrics::MetricsService* metrics_service() { return metrics_service_.get(); }
-
// Records an unexpected renderer (web) process termination.
// This path only exists on iOS because the other platforms use the (now
// deprecated) content::Notification system to get this information into the