diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 20:35:19 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-29 20:35:19 +0000 |
| commit | ddd231eaa03153f6d04894cceb0b4480755e1277 (patch) | |
| tree | faafed02945c1f8934e6e393ac0c6b094c303cdf /chrome/browser/geolocation | |
| parent | c5e30d8572ffae1e0d4fbb2fff765f9a8cbace77 (diff) | |
| download | chromium_src-ddd231eaa03153f6d04894cceb0b4480755e1277.zip chromium_src-ddd231eaa03153f6d04894cceb0b4480755e1277.tar.gz chromium_src-ddd231eaa03153f6d04894cceb0b4480755e1277.tar.bz2 | |
Change a bunch of string types.
Started out just trying to change PrefService::GetString and ::SetString. This snowballed a little bit. Had to change a bunch of url strings in search_engines/ from wstring to string (some of them may be better off as GURLs, but UTF-8 is a step in the right direction, since that's what GURL uses internally, as well as externally via its setters/getters).
TODO (later patch): things that ask for accepted languages should use std::string, not std::wstring.
BUG=none
TEST=try bots
Review URL: http://codereview.chromium.org/2854015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
| -rw-r--r-- | chrome/browser/geolocation/geolocation_permission_context.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/geolocation/geolocation_settings_state.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/geolocation/geolocation_permission_context.cc b/chrome/browser/geolocation/geolocation_permission_context.cc index 46d5bde..4aec91f 100644 --- a/chrome/browser/geolocation/geolocation_permission_context.cc +++ b/chrome/browser/geolocation/geolocation_permission_context.cc @@ -290,7 +290,8 @@ void GeolocationInfoBarQueueController::ShowQueuedInfoBar( tab_contents, this, render_process_id, render_view_id, i->bridge_id, i->requesting_frame, - profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)); + UTF8ToWide(profile_->GetPrefs()->GetString( + prefs::kAcceptLanguages))); tab_contents->AddInfoBar(i->infobar_delegate); break; } diff --git a/chrome/browser/geolocation/geolocation_settings_state.cc b/chrome/browser/geolocation/geolocation_settings_state.cc index a045d6d..f246598 100644 --- a/chrome/browser/geolocation/geolocation_settings_state.cc +++ b/chrome/browser/geolocation/geolocation_settings_state.cc @@ -75,7 +75,7 @@ std::string GeolocationSettingsState::GURLToFormattedHost( const GURL& url) const { std::wstring display_host_wide; net::AppendFormattedHost( - url, profile_->GetPrefs()->GetString(prefs::kAcceptLanguages), + url, UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)), &display_host_wide, NULL, NULL); return WideToUTF8(display_host_wide); } |