Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: chrome/browser/metrics/chrome_metrics_service_client.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/memory_details_win.cc ('k') | chrome/browser/metrics/thread_watcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/metrics/chrome_metrics_service_client.cc
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
index ae947c34b52cff26b165b7173306ecdb9ad318cb..7087add4ead1e7ff20e43a992778e47a428838e0 100644
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -24,6 +24,7 @@
#include "chrome/browser/metrics/time_ticks_experiment_win.h"
#include "chrome/browser/process_resource_usage.h"
#include "chrome/browser/ui/browser_otr_state.h"
+#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
@@ -40,6 +41,7 @@
#include "components/metrics/profiler/tracking_synchronizer.h"
#include "components/metrics/url_constants.h"
#include "components/variations/variations_associated_data.h"
+#include "components/version_info/version_info.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/histogram_fetcher.h"
#include "content/public/browser/notification_service.h"
@@ -204,7 +206,7 @@ bool ChromeMetricsServiceClient::GetBrand(std::string* brand_code) {
}
metrics::SystemProfileProto::Channel ChromeMetricsServiceClient::GetChannel() {
- return metrics::AsProtobufChannel(chrome::VersionInfo::GetChannel());
+ return metrics::AsProtobufChannel(chrome::GetChannel());
}
std::string ChromeMetricsServiceClient::GetVersionString() {
@@ -380,7 +382,7 @@ void ChromeMetricsServiceClient::Initialize() {
// Report exit funnels for canary and dev only.
bool report_exit_funnels = false;
- switch (chrome::VersionInfo::GetChannel()) {
+ switch (chrome::GetChannel()) {
case version_info::Channel::CANARY:
case version_info::Channel::DEV:
report_exit_funnels = true;
« no previous file with comments | « chrome/browser/memory_details_win.cc ('k') | chrome/browser/metrics/thread_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698