Index: chrome/browser/chromeos/ui/echo_dialog_view.cc |
diff --git a/chrome/browser/chromeos/ui/echo_dialog_view.cc b/chrome/browser/chromeos/ui/echo_dialog_view.cc |
index 9e78691a98c0f317ae21cf3ffec99302de3a7645..0fd382cac7cfad48b5904a8cd3f912fd5289c144 100644 |
--- a/chrome/browser/chromeos/ui/echo_dialog_view.cc |
+++ b/chrome/browser/chromeos/ui/echo_dialog_view.cc |
@@ -35,16 +35,16 @@ EchoDialogView::EchoDialogView(EchoDialogListener* listener) |
EchoDialogView::~EchoDialogView() {} |
-void EchoDialogView::InitForEnabledEcho(const string16& service_name, |
- const string16& origin) { |
+void EchoDialogView::InitForEnabledEcho(const base::string16& service_name, |
+ const base::string16& origin) { |
ok_button_label_id_ = IDS_OFFERS_CONSENT_INFOBAR_ENABLE_BUTTON; |
cancel_button_label_id_ = IDS_OFFERS_CONSENT_INFOBAR_DISABLE_BUTTON; |
- string16 link = |
+ base::string16 link = |
l10n_util::GetStringUTF16(IDS_OFFERS_CONSENT_INFOBAR_LABEL_LEARN_MORE); |
std::vector<size_t> offsets; |
- string16 text = l10n_util::GetStringFUTF16(IDS_ECHO_CONSENT_DIALOG_TEXT, |
+ base::string16 text = l10n_util::GetStringFUTF16(IDS_ECHO_CONSENT_DIALOG_TEXT, |
service_name, |
link, |
&offsets); |
@@ -73,11 +73,11 @@ void EchoDialogView::InitForDisabledEcho() { |
ok_button_label_id_ = 0; |
cancel_button_label_id_ = IDS_ECHO_CONSENT_DISMISS_BUTTON; |
- string16 link = |
+ base::string16 link = |
l10n_util::GetStringUTF16(IDS_OFFERS_CONSENT_INFOBAR_LABEL_LEARN_MORE); |
size_t offset; |
- string16 text = l10n_util::GetStringFUTF16( |
+ base::string16 text = l10n_util::GetStringFUTF16( |
IDS_ECHO_DISABLED_CONSENT_DIALOG_TEXT, link, &offset); |
label_ = new views::StyledLabel(text, this); |
@@ -134,7 +134,7 @@ string16 EchoDialogView::GetDialogButtonLabel(ui::DialogButton button) const { |
return l10n_util::GetStringUTF16(ok_button_label_id_); |
if (button == ui::DIALOG_BUTTON_CANCEL && cancel_button_label_id_) |
return l10n_util::GetStringUTF16(cancel_button_label_id_); |
- return string16(); |
+ return base::string16(); |
} |
ui::ModalType EchoDialogView::GetModalType() const { |