Remove wstring from views. Part 3: Switch accessibility strings to string16....

views/controls/textfield/native_textfield_win.cc

 // Copyright (c) 2010 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 "views/controls/textfield/native_textfield_win.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
@@ skipping 377 matching lines @@
 
   // Set the accessible role.
   var.vt = VT_I4;
   var.lVal = ROLE_SYSTEM_TEXT;
   hr = pAccPropServices->SetHwndProp(m_hWnd, OBJID_CLIENT,
       CHILDID_SELF, PROPID_ACC_ROLE, var);
 
   // Set the accessible name by getting the label text.
   View* parent = textfield_->GetParent();
   int label_index = parent->GetChildIndex(textfield_) - 1;
-  if (label_index  >= 0) {
+  if (label_index >= 0) {
     // Try to find the name of this text field.
     // We expect it to be a Label preceeding this view (if it exists).
-    std::wstring name;
-    View* label_view = parent->GetChildViewAt(label_index );
-    if (label_view ->GetClassName() == Label::kViewClassName &&
-        label_view ->GetAccessibleName(&name)) {
+    string16 name;
+    View* label_view = parent->GetChildViewAt(label_index);
+    if (label_view->GetClassName() == Label::kViewClassName &&
+        label_view->GetAccessibleName(&name)) {
       hr = pAccPropServices->SetHwndPropStr(m_hWnd, OBJID_CLIENT,
           CHILDID_SELF, PROPID_ACC_NAME, name.c_str());
     }
   }
 }
 
 void NativeTextfieldWin::UpdateAccessibleState(uint32 state_flag,
                                                bool set_value) {
   base::win::ScopedComPtr<IAccPropServices> pAccPropServices;
   HRESULT hr = CoCreateInstance(CLSID_AccPropServices, NULL, CLSCTX_SERVER,
@@ skipping 704 matching lines @@
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   if (NativeTextfieldViews::IsTextfieldViewsEnabled()) {
     return new NativeTextfieldViews(field);
   } else {
     return new NativeTextfieldWin(field);
   }
 }
 
 }  // namespace views