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

diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc

index 3137fb036757dd6ea9ea0cd74f89491511dc0aac..65ebf181cd3839f1dc8bca03491bb7747e263794 100644

--- a/chrome/browser/upgrade_detector_impl.cc

+++ b/chrome/browser/upgrade_detector_impl.cc

@@ -22,7 +22,7 @@

#include "base/time/time.h"

#include "base/version.h"

#include "chrome/browser/browser_process.h"

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

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

#include "chrome/common/pref_names.h"

@@ -360,7 +360,7 @@ bool UpgradeDetectorImpl::DetectOutdatedInstall() {

static bool simulate_outdated = SimulatingOutdated();

if (!simulate_outdated) {

std::string brand;

- if (google_util::GetBrand(&brand) && !google_util::IsOrganic(brand))

+ if (google_brand::GetBrand(&brand) && !google_brand::IsOrganic(brand))

return false;

#if defined(OS_WIN)