diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 21:38:54 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-22 21:38:54 +0000 |
| commit | e3cc52018a52135221bf68d330ed81f61eb8982b (patch) | |
| tree | e01b9c98dd2b9911eec2dbe697c26f479543da6a /chrome/browser/ui/cocoa/external_protocol_dialog.mm | |
| parent | ceb5362e6702443f62a301bbc4ca1593b8fd9859 (diff) | |
| download | chromium_src-e3cc52018a52135221bf68d330ed81f61eb8982b.zip chromium_src-e3cc52018a52135221bf68d330ed81f61eb8982b.tar.gz chromium_src-e3cc52018a52135221bf68d330ed81f61eb8982b.tar.bz2 | |
Convert ElideString to use string16 instead of wstring.
BUG=23581
Review URL: http://codereview.chromium.org/6526027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75641 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/external_protocol_dialog.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/external_protocol_dialog.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/external_protocol_dialog.mm b/chrome/browser/ui/cocoa/external_protocol_dialog.mm index d288ec1..1fe4783 100644 --- a/chrome/browser/ui/cocoa/external_protocol_dialog.mm +++ b/chrome/browser/ui/cocoa/external_protocol_dialog.mm @@ -61,14 +61,14 @@ void ExternalProtocolHandler::RunExternalProtocolDialog( IDS_EXTERNAL_PROTOCOL_CANCEL_BUTTON_TEXT)]; const int kMaxUrlWithoutSchemeSize = 256; - std::wstring elided_url_without_scheme; - ui::ElideString(ASCIIToWide(url_.possibly_invalid_spec()), + string16 elided_url_without_scheme; + ui::ElideString(ASCIIToUTF16(url_.possibly_invalid_spec()), kMaxUrlWithoutSchemeSize, &elided_url_without_scheme); NSString* urlString = l10n_util::GetNSStringFWithFixup( IDS_EXTERNAL_PROTOCOL_INFORMATION, ASCIIToUTF16(url_.scheme() + ":"), - WideToUTF16(elided_url_without_scheme)); + elided_url_without_scheme); NSString* appString = l10n_util::GetNSStringFWithFixup( IDS_EXTERNAL_PROTOCOL_APPLICATION_TO_LAUNCH, appName); |