wstring: remove wstrings from all tooltip-related code

This is a nearly-mechanical translation of wstring to string16.
Removes a *ton* of string conversions.

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

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

27 files changed, 76 insertions, 79 deletions

diff --git a/views/accessibility/native_view_accessibility_win.cc b/views/accessibility/native_view_accessibility_win.cc
index 347c5e8..d9cdaac 100644
--- a/views/accessibility/native_view_accessibility_win.cc
+++ b/views/accessibility/native_view_accessibility_win.cc
@@ -280,7 +280,7 @@ STDMETHODIMP NativeViewAccessibilityWin::get_accDescription(
   if (!view_)
     return E_FAIL;
 
-  std::wstring temp_desc;
+  string16 temp_desc;
 
   view_->GetTooltipText(gfx::Point(), &temp_desc);
   if (!temp_desc.empty()) {
diff --git a/views/controls/button/button.cc b/views/controls/button/button.cc
index 6d18204..e9f7e2b 100644
--- a/views/controls/button/button.cc
+++ b/views/controls/button/button.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -15,8 +15,8 @@ namespace views {
 Button::~Button() {
 }
 
-void Button::SetTooltipText(const std::wstring& tooltip_text) {
-  tooltip_text_ = WideToUTF16Hack(tooltip_text);
+void Button::SetTooltipText(const string16& tooltip_text) {
+  tooltip_text_ = tooltip_text;
   TooltipTextChanged();
 }
 
@@ -31,11 +31,11 @@ void Button::SetAccessibleKeyboardShortcut(const string16& shortcut) {
 ////////////////////////////////////////////////////////////////////////////////
 // Button, View overrides:
 
-bool Button::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
+bool Button::GetTooltipText(const gfx::Point& p, string16* tooltip) {
   if (tooltip_text_.empty())
     return false;
 
-  *tooltip = UTF16ToWideHack(tooltip_text_);
+  *tooltip = tooltip_text_;
   return true;
 }
 
diff --git a/views/controls/button/button.h b/views/controls/button/button.h
index dde56c1..f1f1a10 100644
--- a/views/controls/button/button.h
+++ b/views/controls/button/button.h
@@ -29,7 +29,7 @@ class VIEWS_EXPORT Button : public View {
  public:
   virtual ~Button();
 
-  void SetTooltipText(const std::wstring& tooltip_text);
+  void SetTooltipText(const string16& tooltip_text);
 
   int tag() const { return tag_; }
   void set_tag(int tag) { tag_ = tag; }
@@ -40,8 +40,7 @@ class VIEWS_EXPORT Button : public View {
   void SetAccessibleKeyboardShortcut(const string16& shortcut);
 
   // Overridden from View:
-  virtual bool GetTooltipText(const gfx::Point& p,
-                              std::wstring* tooltip) OVERRIDE;
+  virtual bool GetTooltipText(const gfx::Point& p, string16* tooltip) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  protected:
diff --git a/views/controls/button/image_button.cc b/views/controls/button/image_button.cc
index 612ce88..76ed12c 100644
--- a/views/controls/button/image_button.cc
+++ b/views/controls/button/image_button.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -141,8 +141,8 @@ void ToggleImageButton::SetToggledImage(ButtonState state,
   }
 }
 
-void ToggleImageButton::SetToggledTooltipText(const std::wstring& tooltip) {
-  toggled_tooltip_text_ = WideToUTF16Hack(tooltip);
+void ToggleImageButton::SetToggledTooltipText(const string16& tooltip) {
+  toggled_tooltip_text_ = tooltip;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -163,11 +163,11 @@ void ToggleImageButton::SetImage(ButtonState state, const SkBitmap* image) {
 // ToggleImageButton, View overrides:
 
 bool ToggleImageButton::GetTooltipText(const gfx::Point& p,
-                                       std::wstring* tooltip) {
+                                       string16* tooltip) {
   if (!toggled_ || toggled_tooltip_text_.empty())
     return Button::GetTooltipText(p, tooltip);
 
-  *tooltip = UTF16ToWideHack(toggled_tooltip_text_);
+  *tooltip = toggled_tooltip_text_;
   return true;
 }
 
diff --git a/views/controls/button/image_button.h b/views/controls/button/image_button.h
index 95f4b47..0dc3ab4 100644
--- a/views/controls/button/image_button.h
+++ b/views/controls/button/image_button.h
@@ -93,13 +93,13 @@ class VIEWS_EXPORT ToggleImageButton : public ImageButton {
   void SetToggledImage(ButtonState state, const SkBitmap* image);
 
   // Set the tooltip text displayed when the button is toggled.
-  void SetToggledTooltipText(const std::wstring& tooltip);
+  void SetToggledTooltipText(const string16& tooltip);
 
   // Overridden from ImageButton:
   virtual void SetImage(ButtonState aState, const SkBitmap* anImage);
 
   // Overridden from View:
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
+  virtual bool GetTooltipText(const gfx::Point& p, string16* tooltip);
 
  private:
   // The parent class's images_ member is used for the current images,
diff --git a/views/controls/image_view.cc b/views/controls/image_view.cc
index 67f9190b..c0dcad3 100644
--- a/views/controls/image_view.cc
+++ b/views/controls/image_view.cc
@@ -155,15 +155,15 @@ ImageView::Alignment ImageView::GetVerticalAlignment() {
   return vert_alignment_;
 }
 
-void ImageView::SetTooltipText(const std::wstring& tooltip) {
-  tooltip_text_ = WideToUTF16Hack(tooltip);
+void ImageView::SetTooltipText(const string16& tooltip) {
+  tooltip_text_ = tooltip;
 }
 
-std::wstring ImageView::GetTooltipText() {
-  return UTF16ToWideHack(tooltip_text_);
+string16 ImageView::GetTooltipText() {
+  return tooltip_text_;
 }
 
-bool ImageView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
+bool ImageView::GetTooltipText(const gfx::Point& p, string16* tooltip) {
   if (tooltip_text_.empty())
     return false;
 
diff --git a/views/controls/image_view.h b/views/controls/image_view.h
index 7a346b3..2bd4a92 100644
--- a/views/controls/image_view.h
+++ b/views/controls/image_view.h
@@ -71,15 +71,14 @@ class VIEWS_EXPORT ImageView : public View {
   Alignment GetVerticalAlignment();
 
   // Set / Get the tooltip text.
-  void SetTooltipText(const std::wstring& tooltip);
-  std::wstring GetTooltipText();
+  void SetTooltipText(const string16& tooltip);
+  string16 GetTooltipText();
 
   // Overriden from View
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip)
-      OVERRIDE;
+  virtual bool GetTooltipText(const gfx::Point& p, string16* tooltip) OVERRIDE;
 
  private:
   // Compute the image origin given the desired size and the receiver alignment
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 54978ec..e61c6e1 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -129,8 +129,8 @@ void Label::SetElideInMiddle(bool elide_in_middle) {
   }
 }
 
-void Label::SetTooltipText(const std::wstring& tooltip_text) {
-  tooltip_text_ = WideToUTF16Hack(tooltip_text);
+void Label::SetTooltipText(const string16& tooltip_text) {
+  tooltip_text_ = tooltip_text;
 }
 
 void Label::SetMouseOverBackground(Background* background) {
@@ -234,19 +234,19 @@ void Label::OnMouseExited(const MouseEvent& event) {
   SetContainsMouse(false);
 }
 
-bool Label::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
+bool Label::GetTooltipText(const gfx::Point& p, string16* tooltip) {
   DCHECK(tooltip);
 
   // If a tooltip has been explicitly set, use it.
   if (!tooltip_text_.empty()) {
-    tooltip->assign(UTF16ToWideHack(tooltip_text_));
+    tooltip->assign(tooltip_text_);
     return true;
   }
 
   // Show the full text if the text does not fit.
   if (!is_multi_line_ &&
       (font_.GetStringWidth(text_) > GetAvailableRect().width())) {
-    *tooltip = UTF16ToWideHack(text_);
+    *tooltip = text_;
     return true;
   }
   return false;
diff --git a/views/controls/label.h b/views/controls/label.h
index 51aa553..8bca9dd 100644
--- a/views/controls/label.h
+++ b/views/controls/label.h
@@ -124,7 +124,7 @@ class VIEWS_EXPORT Label : public View {
   // show the full text if it is wider than its bounds.  Calling this overrides
   // the default behavior and lets you set a custom tooltip.  To revert to
   // default behavior, call this with an empty string.
-  void SetTooltipText(const std::wstring& tooltip_text);
+  void SetTooltipText(const string16& tooltip_text);
 
   // The background color to use when the mouse is over the label. Label
   // takes ownership of the Background.
@@ -171,12 +171,13 @@ class VIEWS_EXPORT Label : public View {
   virtual void OnMouseMoved(const MouseEvent& event) OVERRIDE;
   virtual void OnMouseEntered(const MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const MouseEvent& event) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+
   // Gets the tooltip text for labels that are wider than their bounds, except
   // when the label is multiline, in which case it just returns false (no
   // tooltip).  If a custom tooltip has been specified with SetTooltipText()
   // it is returned instead.
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  bool GetTooltipText(const gfx::Point& p, string16* tooltip);
 
  protected:
   // Called by Paint to paint the text.  Override this to change how
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc
index d0a162f..db3d491 100644
--- a/views/controls/label_unittest.cc
+++ b/views/controls/label_unittest.cc
@@ -110,19 +110,19 @@ TEST(LabelTest, MultiLineProperty) {
 
 TEST(LabelTest, TooltipProperty) {
   Label label;
-  std::wstring test_text(L"My cool string.");
-  label.SetText(test_text);
+  string16 test_text(ASCIIToUTF16("My cool string."));
+  label.SetText(UTF16ToWideHack(test_text));
 
-  std::wstring tooltip;
+  string16 tooltip;
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(test_text, tooltip);
 
-  std::wstring tooltip_text(L"The tooltip!");
+  string16 tooltip_text(ASCIIToUTF16("The tooltip!"));
   label.SetTooltipText(tooltip_text);
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(tooltip_text, tooltip);
 
-  std::wstring empty_text;
+  string16 empty_text;
   label.SetTooltipText(empty_text);
   EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(test_text, tooltip);
diff --git a/views/controls/menu/menu_delegate.cc b/views/controls/menu/menu_delegate.cc
index 9a3b177..eea9fd4 100644
--- a/views/controls/menu/menu_delegate.cc
+++ b/views/controls/menu/menu_delegate.cc
@@ -21,9 +21,8 @@ const gfx::Font& MenuDelegate::GetLabelFont(int id) const {
   return MenuConfig::instance().font;
 }
 
-std::wstring MenuDelegate::GetTooltipText(int id,
-                                          const gfx::Point& screen_loc) {
-  return std::wstring();
+string16 MenuDelegate::GetTooltipText(int id, const gfx::Point& screen_loc) {
+  return string16();
 }
 
 bool MenuDelegate::GetAccelerator(int id, Accelerator* accelerator) {
diff --git a/views/controls/menu/menu_delegate.h b/views/controls/menu/menu_delegate.h
index f76569e..9d7c8a2 100644
--- a/views/controls/menu/menu_delegate.h
+++ b/views/controls/menu/menu_delegate.h
@@ -66,7 +66,7 @@ class VIEWS_EXPORT MenuDelegate {
 
   // The tooltip shown for the menu item. This is invoked when the user
   // hovers over the item, and no tooltip text has been set for that item.
-  virtual std::wstring GetTooltipText(int id, const gfx::Point& screen_loc);
+  virtual string16 GetTooltipText(int id, const gfx::Point& screen_loc);
 
   // If there is an accelerator for the menu item with id |id| it is set in
   // |accelerator| and true is returned.
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index 86e6a70..ff9c0e3 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -40,7 +40,7 @@ class EmptyMenuMenuItem : public MenuItemView {
     SetEnabled(false);
   }
 
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
+  virtual bool GetTooltipText(const gfx::Point& p, string16* tooltip) OVERRIDE {
     // Empty menu items shouldn't have a tooltip.
     return false;
   }
@@ -101,8 +101,8 @@ void MenuItemView::ChildPreferredSizeChanged(View* child) {
   PreferredSizeChanged();
 }
 
-bool MenuItemView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
-  *tooltip = UTF16ToWideHack(tooltip_);
+bool MenuItemView::GetTooltipText(const gfx::Point& p, string16* tooltip) {
+  *tooltip = tooltip_;
   if (!tooltip->empty())
     return true;
 
@@ -297,10 +297,10 @@ void MenuItemView::SetSelected(bool selected) {
   SchedulePaint();
 }
 
-void MenuItemView::SetTooltip(const std::wstring& tooltip, int item_id) {
+void MenuItemView::SetTooltip(const string16& tooltip, int item_id) {
   MenuItemView* item = GetMenuItemByID(item_id);
   DCHECK(item);
-  item->tooltip_ = WideToUTF16Hack(tooltip);
+  item->tooltip_ = tooltip;
 }
 
 void MenuItemView::SetIcon(const SkBitmap& icon, int item_id) {
diff --git a/views/controls/menu/menu_item_view.h b/views/controls/menu/menu_item_view.h
index 6b91c8d..beb487b 100644
--- a/views/controls/menu/menu_item_view.h
+++ b/views/controls/menu/menu_item_view.h
@@ -111,8 +111,7 @@ class VIEWS_EXPORT MenuItemView : public View {
   explicit MenuItemView(MenuDelegate* delegate);
 
   // Overridden from View:
-  virtual bool GetTooltipText(const gfx::Point& p,
-                              std::wstring* tooltip) OVERRIDE;
+  virtual bool GetTooltipText(const gfx::Point& p, string16* tooltip) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Returns the preferred height of menu items. This is only valid when the
@@ -243,7 +242,7 @@ class VIEWS_EXPORT MenuItemView : public View {
   bool IsSelected() const { return selected_; }
 
   // Sets the |tooltip| for a menu item view with |item_id| identifier.
-  void SetTooltip(const std::wstring& tooltip, int item_id);
+  void SetTooltip(const string16& tooltip, int item_id);
 
   // Sets the icon for the descendant identified by item_id.
   void SetIcon(const SkBitmap& icon, int item_id);
diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc
index 7091500..f15f5dd 100644
--- a/views/controls/progress_bar.cc
+++ b/views/controls/progress_bar.cc
@@ -289,11 +289,11 @@ void ProgressBar::OnPaint(gfx::Canvas* canvas) {
 #endif
 }
 
-bool ProgressBar::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
+bool ProgressBar::GetTooltipText(const gfx::Point& p, string16* tooltip) {
   DCHECK(tooltip);
   if (tooltip == NULL)
     return false;
-  tooltip->assign(UTF16ToWideHack(tooltip_text_));
+  tooltip->assign(tooltip_text_);
   return !tooltip_text_.empty();
 }
 
@@ -315,8 +315,8 @@ void ProgressBar::SetValue(double value) {
   }
 }
 
-void ProgressBar::SetTooltipText(const std::wstring& tooltip_text) {
-  tooltip_text_ = WideToUTF16Hack(tooltip_text);
+void ProgressBar::SetTooltipText(const string16& tooltip_text) {
+  tooltip_text_ = tooltip_text;
 }
 
 }  // namespace views
diff --git a/views/controls/progress_bar.h b/views/controls/progress_bar.h
index 5156c8f..c4d3f24 100644
--- a/views/controls/progress_bar.h
+++ b/views/controls/progress_bar.h
@@ -39,8 +39,7 @@ class VIEWS_EXPORT ProgressBar : public View {
   virtual std::string GetClassName() const OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip)
-      OVERRIDE;
+  virtual bool GetTooltipText(const gfx::Point& p, string16* tooltip) OVERRIDE;
 
   // Sets the inclusive range of values to be displayed.  Values outside of the
   // range will be capped when displayed.
@@ -54,7 +53,7 @@ class VIEWS_EXPORT ProgressBar : public View {
   // Sets the tooltip text.  Default behavior for a progress bar is to show no
   // tooltip on mouse hover. Calling this lets you set a custom tooltip.  To
   // revert to default behavior, call this with an empty string.
-  virtual void SetTooltipText(const std::wstring& tooltip_text);
+  void SetTooltipText(const string16& tooltip_text);
 
 
  private:
diff --git a/views/controls/progress_bar_unittest.cc b/views/controls/progress_bar_unittest.cc
index 16f1581..7d62b99 100644
--- a/views/controls/progress_bar_unittest.cc
+++ b/views/controls/progress_bar_unittest.cc
@@ -12,10 +12,10 @@ namespace views {
 
 TEST(ProgressBarTest, TooltipTextProperty) {
   ProgressBar bar;
-  std::wstring tooltip = L"Some text";
+  string16 tooltip = ASCIIToUTF16("Some text");
   EXPECT_FALSE(bar.GetTooltipText(gfx::Point(), &tooltip));
-  EXPECT_EQ(L"", tooltip);
-  std::wstring tooltip_text = L"My progress";
+  EXPECT_EQ(string16(), tooltip);
+  string16 tooltip_text = ASCIIToUTF16("My progress");
   bar.SetTooltipText(tooltip_text);
   EXPECT_TRUE(bar.GetTooltipText(gfx::Point(), &tooltip));
   EXPECT_EQ(tooltip_text, tooltip);
diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index 209959d..1a568cf 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -324,7 +324,7 @@ bool NativeTableWin::ProcessMessage(UINT message, WPARAM w_param,
         // be called when dwFlags would be LVGIT_UNFOLDED.  Removing it entirely
         // will disable all of the above behavior.
         NMLVGETINFOTIP* info_tip = reinterpret_cast<NMLVGETINFOTIP*>(hdr);
-        std::wstring tooltip = table_->model()->GetTooltip(info_tip->iItem);
+        string16 tooltip = table_->model()->GetTooltip(info_tip->iItem);
         CHECK(info_tip->cchTextMax >= 2);
         if (tooltip.length() >= static_cast<size_t>(info_tip->cchTextMax)) {
           // Elide the tooltip if necessary.
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index c761bb6..b6b6bb5 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -1080,13 +1080,13 @@ LRESULT TableView::OnNotify(int w_param, LPNMHDR hdr) {
       // called when dwFlags would be LVGIT_UNFOLDED.  Removing it entirely will
       // disable all of the above behavior.
       NMLVGETINFOTIP* info_tip = reinterpret_cast<NMLVGETINFOTIP*>(hdr);
-      std::wstring tooltip =
+      string16 tooltip =
           model_->GetTooltip(ViewToModel(info_tip->iItem));
       CHECK(info_tip->cchTextMax >= 2);
       if (tooltip.length() >= static_cast<size_t>(info_tip->cchTextMax)) {
         tooltip.erase(info_tip->cchTextMax - 2);  // Ellipsis + '\0'
-        const wchar_t kEllipsis = L'\x2026';
-        tooltip += kEllipsis;
+        const char16 kEllipsis = 0x2026;
+        tooltip.push_back(kEllipsis);
       }
       if (!tooltip.empty())
         wcscpy_s(info_tip->pszText, tooltip.length() + 1, tooltip.c_str());
diff --git a/views/view.cc b/views/view.cc
index 7ea42bf..dfd8f2f 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -944,7 +944,7 @@ FocusTraversable* View::GetPaneFocusTraversable() {
 
 // Tooltips --------------------------------------------------------------------
 
-bool View::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
+bool View::GetTooltipText(const gfx::Point& p, string16* tooltip) {
   return false;
 }
 
diff --git a/views/view.h b/views/view.h
index 4cd9274..c12c2bd2 100644
--- a/views/view.h
+++ b/views/view.h
@@ -736,7 +736,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
   // Any time the tooltip text that a View is displaying changes, it must
   // invoke TooltipTextChanged.
   // |p| provides the coordinates of the mouse (relative to this view).
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
+  virtual bool GetTooltipText(const gfx::Point& p, string16* tooltip);
 
   // Returns the location (relative to this View) for the text on the tooltip
   // to display. If false is returned (the default), the tooltip is placed at
diff --git a/views/widget/tooltip_manager.cc b/views/widget/tooltip_manager.cc
index 1323318..db15c9e 100644
--- a/views/widget/tooltip_manager.cc
+++ b/views/widget/tooltip_manager.cc
@@ -13,17 +13,17 @@
 namespace {
 
 // Maximum number of characters we allow in a tooltip.
-static const size_t kMaxTooltipLength = 1024;
+const size_t kMaxTooltipLength = 1024;
 
 // Maximum number of lines we allow in the tooltip.
-static const size_t kMaxLines = 6;
+const size_t kMaxLines = 6;
 
 }  // anonymous namespace
 
 namespace views {
 
 // static
-void TooltipManager::TrimTooltipToFit(std::wstring* text,
+void TooltipManager::TrimTooltipToFit(string16* text,
                                       int* max_width,
                                       int* line_count,
                                       int x,
@@ -41,7 +41,7 @@ void TooltipManager::TrimTooltipToFit(std::wstring* text,
 
   // Split the string into at most kMaxLines lines.
   std::vector<string16> lines;
-  base::SplitString(WideToUTF16(*text), '\n', &lines);
+  base::SplitString(*text, '\n', &lines);
   if (lines.size() > kMaxLines)
     lines.resize(kMaxLines);
   *line_count = static_cast<int>(lines.size());
@@ -57,7 +57,7 @@ void TooltipManager::TrimTooltipToFit(std::wstring* text,
       result.push_back('\n');
     result.append(elided_text);
   }
-  *text = UTF16ToWideHack(result);
+  *text = result;
 }
 
 }  // namespace views
diff --git a/views/widget/tooltip_manager.h b/views/widget/tooltip_manager.h
index e58f79c..6b4c8d9 100644
--- a/views/widget/tooltip_manager.h
+++ b/views/widget/tooltip_manager.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/string16.h"
 #include "views/views_export.h"
 
 namespace gfx {
@@ -55,7 +56,7 @@ class VIEWS_EXPORT TooltipManager {
   // |max_width| to the width (in pixels) of the clipped text and |line_count|
   // to the number of lines of text in the tooltip. |x| and |y| give the
   // location of the tooltip in screen coordinates.
-  static void TrimTooltipToFit(std::wstring* text,
+  static void TrimTooltipToFit(string16* text,
                                int* max_width,
                                int* line_count,
                                int x,
diff --git a/views/widget/tooltip_manager_gtk.cc b/views/widget/tooltip_manager_gtk.cc
index eb5bf20..8515fa9 100644
--- a/views/widget/tooltip_manager_gtk.cc
+++ b/views/widget/tooltip_manager_gtk.cc
@@ -93,7 +93,7 @@ bool TooltipManagerGtk::ShowTooltip(int x, int y, bool for_keyboard,
   if (!view)
     return false;
 
-  std::wstring text;
+  string16 text;
   if (!view->GetTooltipText(view_loc, &text))
     return false;
 
@@ -138,7 +138,7 @@ void TooltipManagerGtk::ShowKeyboardTooltip(View* view) {
   // We have to hide the current tooltip, then show again.
   HideKeyboardTooltip();
 
-  std::wstring tooltip_text;
+  string16 tooltip_text;
   if (!view->GetTooltipText(gfx::Point(), &tooltip_text))
     return;  // The view doesn't have a tooltip, nothing to do.
 
diff --git a/views/widget/tooltip_manager_views.cc b/views/widget/tooltip_manager_views.cc
index 15964d7..7156b57 100644
--- a/views/widget/tooltip_manager_views.cc
+++ b/views/widget/tooltip_manager_views.cc
@@ -158,7 +158,7 @@ View* TooltipManagerViews::GetViewForTooltip(int x, int y, bool for_keyboard) {
 
 void TooltipManagerViews::UpdateIfRequired(int x, int y, bool for_keyboard) {
   View* view = GetViewForTooltip(x, y, for_keyboard);
-  std::wstring tooltip_text;
+  string16 tooltip_text;
   if (view)
     view->GetTooltipText(gfx::Point(x, y), &tooltip_text);
 
@@ -177,7 +177,7 @@ void TooltipManagerViews::Update() {
     tooltip_widget_->Hide();
   } else {
     int max_width, line_count;
-    std::wstring tooltip_text(tooltip_text_);
+    string16 tooltip_text(tooltip_text_);
     TrimTooltipToFit(&tooltip_text, &max_width, &line_count,
                      curr_mouse_pos_.x(), curr_mouse_pos_.y());
     tooltip_label_.SetText(tooltip_text);
diff --git a/views/widget/tooltip_manager_views.h b/views/widget/tooltip_manager_views.h
index 3a154df..ced0ea2 100644
--- a/views/widget/tooltip_manager_views.h
+++ b/views/widget/tooltip_manager_views.h
@@ -80,7 +80,7 @@ class TooltipManagerViews : public TooltipManager,
   scoped_ptr<Widget> tooltip_widget_;
   internal::RootView* root_view_;
   View* tooltip_view_;
-  std::wstring tooltip_text_;
+  string16 tooltip_text_;
   Label tooltip_label_;
 
   gfx::Point curr_mouse_pos_;
diff --git a/views/widget/tooltip_manager_win.cc b/views/widget/tooltip_manager_win.cc
index 061518c..b35e381 100644
--- a/views/widget/tooltip_manager_win.cc
+++ b/views/widget/tooltip_manager_win.cc
@@ -278,7 +278,7 @@ void TooltipManagerWin::UpdateTooltip(const gfx::Point& mouse_pos) {
     // text has changed.
     gfx::Point view_point = mouse_pos;
     View::ConvertPointToView(root_view, last_tooltip_view_, &view_point);
-    std::wstring new_tooltip_text;
+    string16 new_tooltip_text;
     bool has_tooltip_text =
         last_tooltip_view_->GetTooltipText(view_point, &new_tooltip_text);
     if (!has_tooltip_text || (new_tooltip_text != tooltip_text_)) {
@@ -322,7 +322,7 @@ void TooltipManagerWin::ShowKeyboardTooltip(View* focused_view) {
     tooltip_text_.clear();
   }
   HideKeyboardTooltip();
-  std::wstring tooltip_text;
+  string16 tooltip_text;
   if (!focused_view->GetTooltipText(gfx::Point(), &tooltip_text))
     return;
   gfx::Rect focused_bounds = focused_view->bounds();