Index: chrome/browser/chromeos/options/wimax_config_view.cc |
diff --git a/chrome/browser/chromeos/options/wimax_config_view.cc b/chrome/browser/chromeos/options/wimax_config_view.cc |
index c1b715f738e6d7074b89b61e1c3ad80fd7668f6e..e32374cf4676fbe20b18bdb68e4b7a40af16dd2e 100644 |
--- a/chrome/browser/chromeos/options/wimax_config_view.cc |
+++ b/chrome/browser/chromeos/options/wimax_config_view.cc |
@@ -114,7 +114,7 @@ void WimaxConfigView::UpdateErrorLabel() { |
} |
void WimaxConfigView::ContentsChanged(views::Textfield* sender, |
- const string16& new_contents) { |
+ const base::string16& new_contents) { |
UpdateDialogButtons(); |
} |
@@ -237,7 +237,7 @@ void WimaxConfigView::Init() { |
// Identity |
layout->StartRow(0, column_view_set_id); |
- string16 identity_label_text = l10n_util::GetStringUTF16( |
+ base::string16 identity_label_text = l10n_util::GetStringUTF16( |
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY); |
identity_label_ = new views::Label(identity_label_text); |
layout->AddView(identity_label_); |
@@ -252,7 +252,7 @@ void WimaxConfigView::Init() { |
// Passphrase input |
layout->StartRow(0, column_view_set_id); |
- string16 passphrase_label_text = l10n_util::GetStringUTF16( |
+ base::string16 passphrase_label_text = l10n_util::GetStringUTF16( |
IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE); |
passphrase_label_ = new views::Label(passphrase_label_text); |
layout->AddView(passphrase_label_); |