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

views/view.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/view.h"
 
 #include <algorithm>
 #ifndef NDEBUG
 #include <iostream>
 #endif
@@ skipping 1142 matching lines @@
 }
 
 void View::OnDragDone() {
 }
 
 bool View::InDrag() {
   RootView* root_view = GetRootView();
   return root_view ? (root_view->GetDragView() == this) : false;
 }
 
-bool View::GetAccessibleName(std::wstring* name) {
+bool View::GetAccessibleName(string16* name) {
   DCHECK(name);
 
   if (accessible_name_.empty())
     return false;
-  *name = UTF16ToWideHack(accessible_name_);
+  *name = accessible_name_;
   return true;
 }
 
 AccessibilityTypes::Role View::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_CLIENT;
 }
 
-void View::SetAccessibleName(const std::wstring& name) {
-  accessible_name_ = WideToUTF16Hack(name);
+void View::SetAccessibleName(const string16& name) {
+  accessible_name_ = name;
 }
 
 // static
 void View::ConvertPointToView(const View* src,
                               const View* dst,
                               gfx::Point* point) {
   ConvertPointToView(src, dst, point, true);
 }
 
 // static
@@ skipping 343 matching lines @@
   possible_drag = false;
   start_pt = gfx::Point();
 }
 
 void View::DragInfo::PossibleDrag(const gfx::Point& p) {
   possible_drag = true;
   start_pt = p;
 }
 
 }  // namespace