diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 03:02:51 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 03:02:51 +0000 |
| commit | 57ecc4bf4069cb869e5fb0a7d922eec2384bac25 (patch) | |
| tree | 1b4668fa59d6b6a072144b4ddab8d5f6faba3fa4 /chrome/browser/net | |
| parent | 1af19cfd7b1ef9924516dbe811db495315feaefe (diff) | |
| download | chromium_src-57ecc4bf4069cb869e5fb0a7d922eec2384bac25.zip chromium_src-57ecc4bf4069cb869e5fb0a7d922eec2384bac25.tar.gz chromium_src-57ecc4bf4069cb869e5fb0a7d922eec2384bac25.tar.bz2 | |
Make prefs use std::string for keys rather than wstrings.
Much remains to be converted.
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3076037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 8e9b6ba..a67e506 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -662,7 +662,7 @@ void ChromeURLRequestContextGetter::Observe( CheckCurrentlyOnMainThread(); if (NotificationType::PREF_CHANGED == type) { - std::wstring* pref_name_in = Details<std::wstring>(details).ptr(); + std::string* pref_name_in = Details<std::string>(details).ptr(); PrefService* prefs = Source<PrefService>(source).ptr(); DCHECK(pref_name_in && prefs); if (*pref_name_in == prefs::kAcceptLanguages) { @@ -1019,7 +1019,7 @@ void ChromeURLRequestContextFactory::ApplyProfileParametersToContext( net::ProxyConfig* CreateProxyConfig(const PrefService* pref_service) { // Scan for all "enable" type proxy switches. - static const wchar_t* proxy_prefs[] = { + static const char* proxy_prefs[] = { prefs::kProxyPacUrl, prefs::kProxyServer, prefs::kProxyBypassList, |