diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 06:14:17 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 06:14:17 +0000 |
| commit | 9f284f13fd93a37bd8afa4840e91a953f4c9bc51 (patch) | |
| tree | 4a5e7e73c5ed978b2e18569080a70c18a821da76 /chrome/browser/geolocation/geolocation_permission_context.cc | |
| parent | f33fdc5d17ae9e0439d2e68344da6d5f12dc26a5 (diff) | |
| download | chromium_src-9f284f13fd93a37bd8afa4840e91a953f4c9bc51.zip chromium_src-9f284f13fd93a37bd8afa4840e91a953f4c9bc51.tar.gz chromium_src-9f284f13fd93a37bd8afa4840e91a953f4c9bc51.tar.bz2 | |
Remove the wstring FormatUrl() functions (and convert remaining users to the string16 verison).
Still to do: Actually convert the code underlying FormatUrl().
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3263005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation/geolocation_permission_context.cc')
| -rw-r--r-- | chrome/browser/geolocation/geolocation_permission_context.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/geolocation/geolocation_permission_context.cc b/chrome/browser/geolocation/geolocation_permission_context.cc index 8183106..0434a99 100644 --- a/chrome/browser/geolocation/geolocation_permission_context.cc +++ b/chrome/browser/geolocation/geolocation_permission_context.cc @@ -92,7 +92,7 @@ class GeolocationConfirmInfoBarDelegate : public ConfirmInfoBarDelegate { TabContents* tab_contents, GeolocationInfoBarQueueController* controller, int render_process_id, int render_view_id, int bridge_id, const GURL& requesting_frame_url, - const std::wstring& display_languages) + const std::string& display_languages) : ConfirmInfoBarDelegate(tab_contents), tab_contents_(tab_contents), controller_(controller), @@ -128,8 +128,7 @@ class GeolocationConfirmInfoBarDelegate : public ConfirmInfoBarDelegate { virtual string16 GetMessageText() const { return l10n_util::GetStringFUTF16( IDS_GEOLOCATION_INFOBAR_QUESTION, - WideToUTF16Hack(net::FormatUrl(requesting_frame_url_.GetOrigin(), - display_languages_))); + net::FormatUrl(requesting_frame_url_.GetOrigin(), display_languages_)); } virtual SkBitmap* GetIcon() const { return ResourceBundle::GetSharedInstance().GetBitmapNamed( @@ -160,7 +159,7 @@ class GeolocationConfirmInfoBarDelegate : public ConfirmInfoBarDelegate { int render_view_id_; int bridge_id_; GURL requesting_frame_url_; - std::wstring display_languages_; + std::string display_languages_; DISALLOW_IMPLICIT_CONSTRUCTORS(GeolocationConfirmInfoBarDelegate); }; @@ -298,7 +297,7 @@ void GeolocationInfoBarQueueController::ShowQueuedInfoBar( tab_contents, this, render_process_id, render_view_id, i->bridge_id, i->requesting_frame, - UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages))); + profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)); tab_contents->AddInfoBar(i->infobar_delegate); break; } |