diff options
| author | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 11:41:12 +0000 |
|---|---|---|
| committer | blundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 11:41:12 +0000 |
| commit | dd3e528a58d34ddc5fa518ab30ae83058b4b7497 (patch) | |
| tree | 20db969a562e2ff2656d7c1ea8dbce87f58c7c38 /chrome/browser/first_run | |
| parent | 438f807d5039436f6cd82402037cb8f4b486474e (diff) | |
| download | chromium_src-dd3e528a58d34ddc5fa518ab30ae83058b4b7497.zip chromium_src-dd3e528a58d34ddc5fa518ab30ae83058b4b7497.tar.gz chromium_src-dd3e528a58d34ddc5fa518ab30ae83058b4b7497.tar.bz2 | |
Move branding information out of google_util
google_util is intended for componentization, whereas the information of what
the current brand is and whether a given brand is organic is inherently
embedder-specific. This functionality is moved to a new google_brand namespace.
BUG=373224
TBR=jochen
Review URL: https://codereview.chromium.org/316963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275413 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run')
| -rw-r--r-- | chrome/browser/first_run/first_run.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 89efce7..8afa281 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -24,7 +24,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/updater/extension_updater.h" #include "chrome/browser/first_run/first_run_internal.h" -#include "chrome/browser/google/google_util.h" +#include "chrome/browser/google/google_brand.h" #include "chrome/browser/importer/external_process_importer_host.h" #include "chrome/browser/importer/importer_list.h" #include "chrome/browser/importer/importer_progress_observer.h" @@ -566,8 +566,8 @@ bool CreateSentinel() { #if !defined(OS_LINUX) && !defined(OS_BSD) bool IsOrganicFirstRun() { std::string brand; - google_util::GetBrand(&brand); - return google_util::IsOrganicFirstRun(brand); + google_brand::GetBrand(&brand); + return google_brand::IsOrganicFirstRun(brand); } #endif |