summaryrefslogtreecommitdiffstats
path: root/chrome/browser/search_engines
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 01:23:00 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 01:23:00 +0000
commit660e428f4baafdd433f978f7e4074677611f0de9 (patch)
tree6c73e5446b8b9699b3fa69fd44bf75f098b6f8f5 /chrome/browser/search_engines
parentf13997f0122a7584f3205a8c5a117007f557e951 (diff)
downloadchromium_src-660e428f4baafdd433f978f7e4074677611f0de9.zip
chromium_src-660e428f4baafdd433f978f7e4074677611f0de9.tar.gz
chromium_src-660e428f4baafdd433f978f7e4074677611f0de9.tar.bz2
Remove usage of GetSwitchValue for most of chrome/browser/.
Review URL: http://codereview.chromium.org/3005053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines')
-rw-r--r--chrome/browser/search_engines/template_url_prepopulate_data.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc
index 20bd8a9..0f10a6c 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc
@@ -2738,11 +2738,11 @@ int GetCurrentCountryID() {
int GetCountryIDFromPrefs(PrefService* prefs) {
// See if the user overrode the country on the command line.
- const std::wstring country(
- CommandLine::ForCurrentProcess()->GetSwitchValue(switches::kCountry));
+ const std::string country(
+ CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+ switches::kCountry));
if (country.length() == 2)
- return CountryCharsToCountryIDWithUpdate(static_cast<char>(country[0]),
- static_cast<char>(country[1]));
+ return CountryCharsToCountryIDWithUpdate(country[0], country[1]);
// Cache first run Country ID value in prefs, and use it afterwards. This
// ensures that just because the user moves around, we won't automatically