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

views/accessibility/view_accessibility.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/accessibility/view_accessibility.h"
 
 #include "app/view_prop.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_win.h"
 
@@ skipping 264 matching lines @@
 }
 
 STDMETHODIMP ViewAccessibility::get_accDefaultAction(
     VARIANT var_id, BSTR* def_action) {
   if (!IsValidId(var_id) || !def_action)
     return E_INVALIDARG;
 
   if (!view_)
     return E_FAIL;
 
-  std::wstring temp_action = view_->GetAccessibleDefaultAction();
+  string16 temp_action = view_->GetAccessibleDefaultAction();
 
   if (!temp_action.empty()) {
     *def_action = SysAllocString(temp_action.c_str());
   } else {
     return S_FALSE;
   }
 
   return S_OK;
 }
 
@@ skipping 44 matching lines @@
 }
 
 STDMETHODIMP ViewAccessibility::get_accKeyboardShortcut(
     VARIANT var_id, BSTR* acc_key) {
   if (!IsValidId(var_id) || !acc_key)
     return E_INVALIDARG;
 
   if (!view_)
     return E_FAIL;
 
-  std::wstring temp_key = view_->GetAccessibleKeyboardShortcut();
+  string16 temp_key = view_->GetAccessibleKeyboardShortcut();
 
   if (!temp_key.empty()) {
     *acc_key = SysAllocString(temp_key.c_str());
   } else {
     return S_FALSE;
   }
 
   return S_OK;
 }
 
 STDMETHODIMP ViewAccessibility::get_accName(VARIANT var_id, BSTR* name) {
   if (!IsValidId(var_id) || !name)
     return E_INVALIDARG;
 
   if (!view_)
     return E_FAIL;
 
-  std::wstring temp_name;
+  string16 temp_name;
 
   // Retrieve the current view's name.
   view_->GetAccessibleName(&temp_name);
   if (!temp_name.empty()) {
     // Return name retrieved.
     *name = SysAllocString(temp_name.c_str());
   } else {
     // If view has no name, return S_FALSE.
     return S_FALSE;
   }
@@ skipping 71 matching lines @@
 }
 
 STDMETHODIMP ViewAccessibility::get_accValue(VARIANT var_id, BSTR* value) {
   if (!IsValidId(var_id) || !value)
     return E_INVALIDARG;
 
   if (!view_)
     return E_FAIL;
 
   // Retrieve the current view's value.
-  std::wstring temp_value = view_->GetAccessibleValue();
+  string16 temp_value = view_->GetAccessibleValue();
 
   if (!temp_value.empty()) {
     // Return value retrieved.
     *value = SysAllocString(temp_value.c_str());
   } else {
     // If view has no value, fall back into the default implementation.
     *value = NULL;
     return E_NOTIMPL;
   }
 
@@ skipping 255 matching lines @@
     HWND native_view_window , IAccessible** accessible) {
   if (IsWindow(native_view_window)) {
     LRESULT ret = SendMessage(native_view_window, WM_GETOBJECT, 0,
                               OBJID_CLIENT);
     return ObjectFromLresult(ret, IID_IDispatch, 0,
                              reinterpret_cast<void**>(accessible));
   }
 
   return E_FAIL;
 }