diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 13:00:59 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 13:00:59 +0000 |
| commit | 8600e1b767b582276c0d51165d886c99b098545a (patch) | |
| tree | eea40794f232b29b052417a9573235afe34112f9 /chrome/installer | |
| parent | 5c014f25304cad7e79025da0d51db5377de629f2 (diff) | |
| download | chromium_src-8600e1b767b582276c0d51165d886c99b098545a.zip chromium_src-8600e1b767b582276c0d51165d886c99b098545a.tar.gz chromium_src-8600e1b767b582276c0d51165d886c99b098545a.tar.bz2 | |
Failure to determine brand code should not be treated as failure to determine toast experiment.
BUG=109106
TEST=chrome.exe --try-chrome-again=0 should result in a toast for en-US locale on chromium builds, without having to set brand code manually.
Review URL: http://codereview.chromium.org/9008062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index b8bf4c5..fcb6c07 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -613,9 +613,9 @@ bool GoogleChromeDistribution::GetExperimentDetails( std::wstring brand; if (!GoogleUpdateSettings::GetLanguage(&locale)) - locale = L"en-US"; + locale = ASCIIToWide("en-US"); if (!GoogleUpdateSettings::GetBrand(&brand)) - return false; + brand = ASCIIToWide(""); // Could still be viable for catch-all rules. for (int i = 0; i < arraysize(kExperimentFlavors); ++i) { // A maximum of four flavors is supported at the moment. |