chrome/browser/profile_resetter/automatic_profile_resetter_delegate.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/profile_resetter/automatic_profile_resetter_delegate.cc

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

Patch Set: nit 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/google/google_brand.cc ('K') | « chrome/browser/metrics/chrome_metrics_service_client.cc ('k') | chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

index 3e51eec66e22d833ac44b1995335354e0921adab..e2fd7b68ac9b12cc68e2e662285673d905c407f8 100644

--- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

+++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

@@ -17,6 +17,7 @@

#include "base/values.h"

#include "chrome/app/chrome_command_ids.h"

#include "chrome/browser/chrome_notification_types.h"

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

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

#include "chrome/browser/profile_resetter/brandcode_config_fetcher.h"

#include "chrome/browser/profile_resetter/profile_reset_global_error.h"

@@ -193,7 +194,7 @@ void AutomaticProfileResetterDelegateImpl::

return;

std::string brandcode;

- google_util::GetBrand(&brandcode);

+ google_brand::GetBrand(&brandcode);

if (brandcode.empty()) {

brandcoded_defaults_.reset(new BrandcodedDefaultSettings);

brandcoded_defaults_fetched_event_.Signal();