chrome/browser/ui/webui/options/reset_profile_settings_handler.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/ui/webui/options/reset_profile_settings_handler.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/ui/webui/options/reset_profile_settings_handler.cc

diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc

index 79a10cf538db4dad72743184a28e9912b5451d7a..130eb1372477925062d68dce696847f23ccc3031 100644

--- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc

@@ -10,7 +10,7 @@

#include "base/prefs/pref_service.h"

#include "base/strings/string16.h"

#include "base/values.h"

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

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

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

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

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

@@ -29,7 +29,7 @@ namespace options {

ResetProfileSettingsHandler::ResetProfileSettingsHandler()

: automatic_profile_resetter_(NULL), has_shown_confirmation_dialog_(false) {

- google_util::GetBrand(&brandcode_);

+ google_brand::GetBrand(&brandcode_);

}

ResetProfileSettingsHandler::~ResetProfileSettingsHandler() {}

« no previous file with comments | « chrome/browser/signin/signin_promo.cc ('k') | chrome/browser/upgrade_detector_impl.cc » ('j') | no next file with comments »