| 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();
|
| }
|
|
|