Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2988)

Unified Diff: chrome/browser/chromeos/external_protocol_dialog.cc

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/external_protocol_dialog.cc
diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc
index 0cf11852688565b714167b6dcfdfa4b6ef723985..30f10f2791afd6b35f3f592e949623d5910882e2 100644
--- a/chrome/browser/chromeos/external_protocol_dialog.cc
+++ b/chrome/browser/chromeos/external_protocol_dialog.cc
@@ -52,12 +52,12 @@ int ExternalProtocolDialog::GetDialogButtons() const {
return ui::DIALOG_BUTTON_OK;
}
-string16 ExternalProtocolDialog::GetDialogButtonLabel(
+base::string16 ExternalProtocolDialog::GetDialogButtonLabel(
ui::DialogButton button) const {
return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_OK_BUTTON_TEXT);
}
-string16 ExternalProtocolDialog::GetWindowTitle() const {
+base::string16 ExternalProtocolDialog::GetWindowTitle() const {
return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_TITLE);
}
@@ -94,7 +94,7 @@ ExternalProtocolDialog::ExternalProtocolDialog(WebContents* web_contents,
: creation_time_(base::TimeTicks::Now()),
scheme_(url.scheme()) {
const int kMaxUrlWithoutSchemeSize = 256;
- string16 elided_url_without_scheme;
+ base::string16 elided_url_without_scheme;
gfx::ElideString(ASCIIToUTF16(url.possibly_invalid_spec()),
kMaxUrlWithoutSchemeSize, &elided_url_without_scheme);
« no previous file with comments | « chrome/browser/chromeos/external_protocol_dialog.h ('k') | chrome/browser/chromeos/file_manager/desktop_notifications.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698