summaryrefslogtreecommitdiffstats
path: root/chrome/browser/rlz
diff options
context:
space:
mode:
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-20 22:25:57 +0000
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-20 22:25:57 +0000
commit79bbdb5ce7316a55122d67f10c64f1397118e012 (patch)
tree6dd9cb429c93c4e9a9a7ccf7032e9f5b541b3ef6 /chrome/browser/rlz
parentc4627b97fc8aa0932a544fd18a3193e3981b6b89 (diff)
downloadchromium_src-79bbdb5ce7316a55122d67f10c64f1397118e012.zip
chromium_src-79bbdb5ce7316a55122d67f10c64f1397118e012.tar.gz
chromium_src-79bbdb5ce7316a55122d67f10c64f1397118e012.tar.bz2
Include the EUB* and EUC* brands to be excluded from RLZ
BUG=32295 TEST=See bug for testing info Review URL: http://codereview.chromium.org/555007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/rlz')
-rw-r--r--chrome/browser/rlz/rlz.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc
index 669d674..7141b66 100644
--- a/chrome/browser/rlz/rlz.cc
+++ b/chrome/browser/rlz/rlz.cc
@@ -16,6 +16,7 @@
#include "base/file_util.h"
#include "base/message_loop.h"
#include "base/path_service.h"
+#include "base/string_util.h"
#include "base/task.h"
#include "base/thread.h"
#include "chrome/browser/browser_process.h"
@@ -297,7 +298,11 @@ class DelayedInitTask : public Task {
L"GGLA" };
const wchar_t** end = &kBrands[arraysize(kBrands)];
const wchar_t** found = std::find(&kBrands[0], end, brand);
- return (found != end);
+ if (found != end)
+ return true;
+ if (StartsWith(brand, L"EUB", true) || StartsWith(brand, L"EUC", true))
+ return true;
+ return false;
}
int directory_key_;