Replace string16 with base::string16.

chrome/browser/chromeos/options/wimax_config_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/options/wimax_config_view.h"
 
 #include "ash/system/chromeos/network/network_connect.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 96 matching lines @@
   }
   if (!error_msg.empty()) {
     error_label_->SetText(error_msg);
     error_label_->SetVisible(true);
   } else {
     error_label_->SetVisible(false);
   }
 }
 
 void WimaxConfigView::ContentsChanged(views::Textfield* sender,
-                                      const string16& new_contents) {
+                                      const base::string16& new_contents) {
   UpdateDialogButtons();
 }
 
 bool WimaxConfigView::HandleKeyEvent(views::Textfield* sender,
                                      const ui::KeyEvent& key_event) {
   if (sender == passphrase_textfield_ &&
       key_event.key_code() == ui::VKEY_RETURN) {
     parent_->GetDialogClientView()->AcceptWindow();
   }
   return false;
@@ skipping 102 matching lines @@
   layout->StartRow(0, column_view_set_id);
   layout->AddView(new views::Label(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_TAB_NETWORK)));
   views::Label* label = new views::Label(UTF8ToUTF16(wimax->name()));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->AddView(label);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // 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_);
   identity_textfield_ = new views::Textfield(
       views::Textfield::STYLE_DEFAULT);
   identity_textfield_->SetAccessibleName(identity_label_text);
   identity_textfield_->SetController(this);
   identity_textfield_->SetEnabled(identity_ui_data_.IsEditable());
   layout->AddView(identity_textfield_);
   layout->AddView(new ControlledSettingIndicatorView(identity_ui_data_));
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // 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_);
   passphrase_textfield_ = new views::Textfield(
       views::Textfield::STYLE_OBSCURED);
   passphrase_textfield_->SetController(this);
   passphrase_label_->SetEnabled(true);
   passphrase_textfield_->SetEnabled(passphrase_ui_data_.IsEditable());
   passphrase_textfield_->SetAccessibleName(passphrase_label_text);
   layout->AddView(passphrase_textfield_);
@@ skipping 105 matching lines @@
   }
 }
 
 void WimaxConfigView::InitFocus() {
   views::View* view_to_focus = GetInitiallyFocusedView();
   if (view_to_focus)
     view_to_focus->RequestFocus();
 }
 
 }  // namespace chromeos