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

views/controls/combobox/combobox.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_COMBOBOX_COMBOBOX_H_
 #define VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_
 #pragma once
 
 #include <string>
 
@@ skipping 43 matching lines @@
 
   // Accessor for |model_|.
   ComboboxModel* model() const { return model_; }
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize();
   virtual void Layout();
   virtual void SetEnabled(bool enabled);
   virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e);
   virtual void PaintFocusBorder(gfx::Canvas* canvas);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual std::wstring GetAccessibleValue();
+  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
+  virtual string16 GetAccessibleValue() OVERRIDE;
 
  protected:
   virtual void Focus();
   virtual void ViewHierarchyChanged(bool is_add, View* parent,
                                     View* child);
   virtual std::string GetClassName() const;
 
   // The object that actually implements the native combobox.
   NativeComboboxWrapper* native_wrapper_;
 
  private:
   // Our model.
   ComboboxModel* model_;
 
   // Item change listener.
   Listener* listener_;
 
   // The current selection.
   int selected_item_;
 
   DISALLOW_COPY_AND_ASSIGN(Combobox);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_COMBOBOX_COMBOBOX_H_