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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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/ui/webui/options/reset_profile_settings_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/upgrade_detector_impl.cc
diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc
index 80f9361522f8600160462bae8a57522815f32989..b7863b848a61555153186b72df30d6f407bdc777 100644
--- a/chrome/browser/upgrade_detector_impl.cc
+++ b/chrome/browser/upgrade_detector_impl.cc
@@ -22,6 +22,7 @@
#include "base/time/time.h"
#include "base/version.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/google/google_brand.h"
#include "chrome/browser/google/google_util.h"
#include "chrome/browser/network_time/network_time_tracker.h"
#include "chrome/common/chrome_switches.h"
@@ -360,7 +361,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)
« chrome/browser/google/google_brand.cc ('K') | « chrome/browser/ui/webui/options/reset_profile_settings_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698