chrome/browser/metrics/chrome_metrics_service_client.cc - Issue 316963002: Move branding information out of google_util

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 316963002: Move branding information out of google_util (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix for Windows Created 6 years, 6 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:

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 011cb3456380f9a4ebd48230fb9a987b5ef72f34..c970657d18319732701edd62aa728f9a78eeb39f 100644

--- a/chrome/browser/metrics/chrome_metrics_service_client.cc

+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc

@@ -19,7 +19,7 @@

#include "base/time/time.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

-#include "chrome/browser/google/google_util.h"

+#include "chrome/browser/google/google_brand.h"

#include "chrome/browser/memory_details.h"

#include "chrome/browser/metrics/extensions_metrics_provider.h"

#include "chrome/browser/metrics/metrics_service.h"

@@ -159,7 +159,7 @@ std::string ChromeMetricsServiceClient::GetApplicationLocale() {

}

bool ChromeMetricsServiceClient::GetBrand(std::string* brand_code) {

- return google_util::GetBrand(brand_code);

+ return google_brand::GetBrand(brand_code);

}

metrics::SystemProfileProto::Channel ChromeMetricsServiceClient::GetChannel() {