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

views/controls/button/button.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/button/button.h"
 #include "base/utf_string_conversions.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 15 matching lines @@
 // Button, View overrides:
 
 bool Button::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
   if (tooltip_text_.empty())
     return false;
 
   *tooltip = UTF16ToWideHack(tooltip_text_);
   return true;
 }
 
-std::wstring Button::GetAccessibleKeyboardShortcut() {
-  return UTF16ToWideHack(accessible_shortcut_);
+string16 Button::GetAccessibleKeyboardShortcut() {
+  return accessible_shortcut_;
 }
 
 AccessibilityTypes::Role Button::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_PUSHBUTTON;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Button, protected:
 
 Button::Button(ButtonListener* listener)
     : listener_(listener),
       tag_(-1),
       mouse_event_flags_(0) {
   set_accessibility_focusable(true);
 }
 
 void Button::NotifyClick(const views::Event& event) {
   mouse_event_flags_ = event.IsMouseEvent() ? event.GetFlags() : 0;
   // We can be called when there is no listener, in cases like double clicks on
   // menu buttons etc.
   if (listener_)
     listener_->ButtonPressed(this, event);
   // NOTE: don't attempt to reset mouse_event_flags_ as the listener may have
   // deleted us.
 }
 
 }  // namespace views