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

views/controls/button/button.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_BUTTON_BUTTON_H_
 #define VIEWS_CONTROLS_BUTTON_BUTTON_H_
 #pragma once
 
 #include "views/view.h"
 
@@ skipping 21 matching lines @@
   void SetTooltipText(const std::wstring& tooltip_text);
 
   int tag() const { return tag_; }
   void set_tag(int tag) { tag_ = tag; }
 
   int mouse_event_flags() const { return mouse_event_flags_; }
 
   void SetAccessibleKeyboardShortcut(const std::wstring& shortcut);
 
   // Overridden from View:
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
-  virtual std::wstring GetAccessibleKeyboardShortcut();
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual bool GetTooltipText(const gfx::Point& p,
+                              std::wstring* tooltip) OVERRIDE;
+  virtual string16 GetAccessibleKeyboardShortcut() OVERRIDE;
+  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
 
  protected:
   // Construct the Button with a Listener. The listener can be NULL. This can be
   // true of buttons that don't have a listener - e.g. menubuttons where there's
   // no default action and checkboxes.
   explicit Button(ButtonListener* listener);
 
   // Cause the button to notify the listener that a click occurred.
   virtual void NotifyClick(const views::Event& event);
 
@@ skipping 13 matching lines @@
 
   // Event flags present when the button was clicked.
   int mouse_event_flags_;
 
   DISALLOW_COPY_AND_ASSIGN(Button);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_BUTTON_BUTTON_H_