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

views/controls/label.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/label.h"
 
 #include <cmath>
 #include <limits>
 
 #include "app/resource_bundle.h"
@@ skipping 89 matching lines @@
   font_ = font;
   text_size_valid_ = false;
   PreferredSizeChanged();
   SchedulePaint();
 }
 
 void Label::SetText(const std::wstring& text) {
   text_ = WideToUTF16Hack(text);
   url_set_ = false;
   text_size_valid_ = false;
-  SetAccessibleName(text);
+  SetAccessibleName(WideToUTF16Hack(text));
   PreferredSizeChanged();
   SchedulePaint();
 }
 
 const std::wstring Label::GetText() const {
   return url_set_ ? UTF8ToWide(url_.spec()) : UTF16ToWideHack(text_);
 }
 
 void Label::SetURL(const GURL& url) {
   url_ = url;
@@ skipping 325 matching lines @@
         font_, GetAvailableRect().width(), true));
   } else {
     *paint_text = UTF16ToWideHack(text_);
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeMultiLineFlags();
 }
 
 }  // namespace views