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

Unified Diff: chrome/browser/chromeos/options/network_config_view.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/options/network_config_view.cc
diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc
index 40b2a96b569c7f46e6fa9763910137c7d3f76552..bea4c5cf6476ab3198813e061eec9860ead33078 100644
--- a/chrome/browser/chromeos/options/network_config_view.cc
+++ b/chrome/browser/chromeos/options/network_config_view.cc
@@ -156,7 +156,7 @@ gfx::NativeWindow NetworkConfigView::GetNativeWindow() const {
return GetWidget()->GetNativeWindow();
}
-string16 NetworkConfigView::GetDialogButtonLabel(
+base::string16 NetworkConfigView::GetDialogButtonLabel(
ui::DialogButton button) const {
if (button == ui::DIALOG_BUTTON_OK)
return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_CONNECT);
@@ -195,7 +195,7 @@ views::View* NetworkConfigView::GetInitiallyFocusedView() {
return child_config_view_->GetInitiallyFocusedView();
}
-string16 NetworkConfigView::GetWindowTitle() const {
+base::string16 NetworkConfigView::GetWindowTitle() const {
DCHECK(!child_config_view_->GetTitle().empty());
return child_config_view_->GetTitle();
}
« no previous file with comments | « chrome/browser/chromeos/options/network_config_view.h ('k') | chrome/browser/chromeos/options/passphrase_textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698