diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:12:15 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:12:15 +0000 |
| commit | cc2a2a22ebb171ff4c1eb528b3f8d7e551512732 (patch) | |
| tree | 9a010de6ab6210b43e4bc7cfa187ef3a80312a0b /chrome/browser/chromeos/external_protocol_dialog.cc | |
| parent | 8af3b22a0f64133ba32f4deaedc6540060520ff7 (diff) | |
| download | chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.zip chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.tar.gz chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.tar.bz2 | |
Revert 242455 "Revert 242449 "Update some uses of UTF conversion..."
> Revert 242449 "Update some uses of UTF conversions in chrome/bro..."
>
> > Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
> >
> > BUG=330556
> > TEST=no change
> > TBR=ben@chromium.org
> >
> > Review URL: https://codereview.chromium.org/120943002
>
> TBR=avi@chromium.org
>
> Review URL: https://codereview.chromium.org/103853007
TBR=avi@chromium.org
Review URL: https://codereview.chromium.org/120993002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/external_protocol_dialog.cc')
| -rw-r--r-- | chrome/browser/chromeos/external_protocol_dialog.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc index 30f10f2..5cc0362 100644 --- a/chrome/browser/chromeos/external_protocol_dialog.cc +++ b/chrome/browser/chromeos/external_protocol_dialog.cc @@ -95,13 +95,13 @@ ExternalProtocolDialog::ExternalProtocolDialog(WebContents* web_contents, scheme_(url.scheme()) { const int kMaxUrlWithoutSchemeSize = 256; base::string16 elided_url_without_scheme; - gfx::ElideString(ASCIIToUTF16(url.possibly_invalid_spec()), + gfx::ElideString(base::ASCIIToUTF16(url.possibly_invalid_spec()), kMaxUrlWithoutSchemeSize, &elided_url_without_scheme); views::MessageBoxView::InitParams params( l10n_util::GetStringFUTF16(IDS_EXTERNAL_PROTOCOL_INFORMATION, - ASCIIToUTF16(url.scheme() + ":"), - elided_url_without_scheme) + ASCIIToUTF16("\n\n")); + base::ASCIIToUTF16(url.scheme() + ":"), + elided_url_without_scheme) + base::ASCIIToUTF16("\n\n")); params.message_width = kMessageWidth; message_box_view_ = new views::MessageBoxView(params); message_box_view_->SetCheckBoxLabel( |