summaryrefslogtreecommitdiffstats
path: root/chrome/browser/rlz
diff options
context:
space:
mode:
authorgwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 20:32:25 +0000
committergwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-13 20:32:25 +0000
commit339382a609b39d51b23736098892f7a7866a1b07 (patch)
treeb82878f0709cc6b4327307b185328cd1b7466d8f /chrome/browser/rlz
parent61f39e60267e65361f30b1d6d47d0937bad16688 (diff)
downloadchromium_src-339382a609b39d51b23736098892f7a7866a1b07.zip
chromium_src-339382a609b39d51b23736098892f7a7866a1b07.tar.gz
chromium_src-339382a609b39d51b23736098892f7a7866a1b07.tar.bz2
Adds brand codes CHHS and CHHM to "organic" list.
R=cpu BUG=none TEST=Install with brand code CHHS or CHHM --> no RLZ. Review URL: http://codereview.chromium.org/1613013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/rlz')
-rw-r--r--chrome/browser/rlz/rlz.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc
index 73b9b3f..6f4dafa 100644
--- a/chrome/browser/rlz/rlz.cc
+++ b/chrome/browser/rlz/rlz.cc
@@ -296,11 +296,12 @@ class DelayedInitTask : public Task {
static bool is_strict_organic(const std::wstring& brand) {
static const wchar_t* kBrands[] = {
- L"CHFO", L"CHFT", L"CHMA", L"CHMB", L"CHME", L"CHMF", L"CHMG", L"CHMH",
- L"CHMI", L"CHMQ", L"CHMV", L"CHNB", L"CHNC", L"CHNG", L"CHNH", L"CHNI",
- L"CHOA", L"CHOB", L"CHOC", L"CHON", L"CHOO", L"CHOP", L"CHOQ", L"CHOR",
- L"CHOS", L"CHOT", L"CHOU", L"CHOX", L"CHOY", L"CHOZ", L"CHPD", L"CHPE",
- L"CHPF", L"CHPG", L"EUBB", L"EUBC", L"GGLA", L"GGLS" };
+ L"CHFO", L"CHFT", L"CHHS", L"CHHM", L"CHMA", L"CHMB", L"CHME", L"CHMF",
+ L"CHMG", L"CHMH", L"CHMI", L"CHMQ", L"CHMV", L"CHNB", L"CHNC", L"CHNG",
+ L"CHNH", L"CHNI", L"CHOA", L"CHOB", L"CHOC", L"CHON", L"CHOO", L"CHOP",
+ L"CHOQ", L"CHOR", L"CHOS", L"CHOT", L"CHOU", L"CHOX", L"CHOY", L"CHOZ",
+ L"CHPD", L"CHPE", L"CHPF", L"CHPG", L"EUBB", L"EUBC", L"GGLA", L"GGLS"
+ };
const wchar_t** end = &kBrands[arraysize(kBrands)];
const wchar_t** found = std::find(&kBrands[0], end, brand);
if (found != end)