Remove wstring from views. Part 2: Switch accelerator strings to string16.

BUG=68267
TEST=no visible changes; all tests pass

Review URL: http://codereview.chromium.org/6199005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70936 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 22 insertions, 20 deletions

diff --git a/views/accelerator.cc b/views/accelerator.cc
index 9cf6884..de1e131 100644
--- a/views/accelerator.cc
+++ b/views/accelerator.cc
@@ -19,7 +19,7 @@
 
 namespace views {
 
-std::wstring Accelerator::GetShortcutText() const {
+string16 Accelerator::GetShortcutText() const {
   int string_id = 0;
   switch(key_code_) {
     case app::VKEY_TAB:
@@ -157,7 +157,7 @@ std::wstring Accelerator::GetShortcutText() const {
     shortcut.swap(shortcut_rtl);
   }
 
-  return UTF16ToWide(shortcut);
+  return shortcut;
 }
 
 }  // namespace views
diff --git a/views/accelerator.h b/views/accelerator.h
index 5cf68f1..05fa83b 100644
--- a/views/accelerator.h
+++ b/views/accelerator.h
@@ -15,6 +15,7 @@
 #include <string>
 
 #include "app/menus/accelerator.h"
+#include "base/string16.h"
 #include "views/event.h"
 
 namespace views {
@@ -53,7 +54,7 @@ class Accelerator : public menus::Accelerator {
   }
 
   // Returns a string with the localized shortcut if any.
-  std::wstring GetShortcutText() const;
+  string16 GetShortcutText() const;
 };
 
 // An interface that classes that want to register for keyboard accelerators
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index 4086018..e2359d7 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -126,13 +126,14 @@ AccessibilityTypes::State MenuItemView::GetAccessibleState() {
 }
 
 // static
-std::wstring MenuItemView::GetAccessibleNameForMenuItem(
-      const std::wstring& item_text, const std::wstring& accelerator_text) {
-  std::wstring accessible_name = item_text;
+string16 MenuItemView::GetAccessibleNameForMenuItem(
+      const string16& item_text, const string16& accelerator_text) {
+  string16 accessible_name = item_text;
 
   // Filter out the "&" for accessibility clients.
   size_t index = 0;
-  while ((index = accessible_name.find(L"&", index)) != std::wstring::npos &&
+  const char16 amp = '&';
+  while ((index = accessible_name.find(amp, index)) != string16::npos &&
          index + 1 < accessible_name.length()) {
     accessible_name.replace(index, accessible_name.length() - index,
                             accessible_name.substr(index + 1));
@@ -143,9 +144,8 @@ std::wstring MenuItemView::GetAccessibleNameForMenuItem(
   }
 
   // Append accelerator text.
-  menus::Accelerator menu_accelerator;
   if (!accelerator_text.empty()) {
-    accessible_name.append(L" ");
+    accessible_name.push_back(' ');
     accessible_name.append(accelerator_text);
   }
 
@@ -306,7 +306,8 @@ SubmenuView* MenuItemView::CreateSubmenu() {
 
 void MenuItemView::SetTitle(const std::wstring& title) {
   title_ = WideToUTF16Hack(title);
-  SetAccessibleName(GetAccessibleNameForMenuItem(title, GetAcceleratorText()));
+  SetAccessibleName(UTF16ToWideHack(
+      GetAccessibleNameForMenuItem(title_, GetAcceleratorText())));
 }
 
 void MenuItemView::SetSelected(bool selected) {
@@ -429,7 +430,7 @@ void MenuItemView::Layout() {
 }
 
 int MenuItemView::GetAcceleratorTextWidth() {
-  string16 text = WideToUTF16Hack(GetAcceleratorText());
+  string16 text = GetAcceleratorText();
   return text.empty() ? 0 : MenuConfig::instance().font.GetStringWidth(text);
 }
 
@@ -593,7 +594,7 @@ void MenuItemView::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
 }
 
 void MenuItemView::PaintAccelerator(gfx::Canvas* canvas) {
-  std::wstring accel_text = GetAcceleratorText();
+  string16 accel_text = GetAcceleratorText();
   if (accel_text.empty())
     return;
 
@@ -612,9 +613,9 @@ void MenuItemView::PaintAccelerator(gfx::Canvas* canvas) {
   else
     flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
   canvas->DrawStringInt(
-      accel_text, font, TextButton::kDisabledColor, accel_bounds.x(),
-      accel_bounds.y(), accel_bounds.width(), accel_bounds.height(),
-      flags);
+      UTF16ToWideHack(accel_text), font, TextButton::kDisabledColor,
+      accel_bounds.x(), accel_bounds.y(), accel_bounds.width(),
+      accel_bounds.height(), flags);
 }
 
 void MenuItemView::DestroyAllMenuHosts() {
@@ -656,11 +657,11 @@ int MenuItemView::GetChildPreferredWidth() {
   return width;
 }
 
-std::wstring MenuItemView::GetAcceleratorText() {
+string16 MenuItemView::GetAcceleratorText() {
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
-      accelerator.GetShortcutText() : std::wstring();
+      accelerator.GetShortcutText() : string16();
 }
 
 }  // namespace views
diff --git a/views/controls/menu/menu_item_view.h b/views/controls/menu/menu_item_view.h
index 86347f9..83e5102 100644
--- a/views/controls/menu/menu_item_view.h
+++ b/views/controls/menu/menu_item_view.h
@@ -106,8 +106,8 @@ class MenuItemView : public View {
 
   // Returns the accessible name to be used with screen readers. Mnemonics are
   // removed and the menu item accelerator text is appended.
-  static std::wstring GetAccessibleNameForMenuItem(
-      const std::wstring& item_text, const std::wstring& accelerator_text);
+  static string16 GetAccessibleNameForMenuItem(
+      const string16& item_text, const string16& accelerator_text);
 
   // Run methods. See description above class for details. Both Run methods take
   // a rectangle, which is used to position the menu. |has_mnemonics| indicates
@@ -348,7 +348,7 @@ class MenuItemView : public View {
   void DestroyAllMenuHosts();
 
   // Returns the accelerator text.
-  std::wstring GetAcceleratorText();
+  string16 GetAcceleratorText();
 
   // Returns the various margins.
   int GetTopMargin();