Change std::wstring to string16 for views::Label and views::Link

views/widget/tooltip_manager_views.cc

 // 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.
 
 #include "views/widget/tooltip_manager_views.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 #endif
@@ skipping 167 matching lines @@
       !tooltip_view_->GetTooltipText(gfx::Point(), &tooltip_text_))
     tooltip_text_.clear();
 
   if (tooltip_text_.empty()) {
     tooltip_widget_->Hide();
   } else {
     int max_width, line_count;
     string16 tooltip_text(tooltip_text_);
     TrimTooltipToFit(&tooltip_text, &max_width, &line_count,
                      curr_mouse_pos_.x(), curr_mouse_pos_.y());
-    tooltip_label_.SetText(UTF16ToWideHack(tooltip_text));
+    tooltip_label_.SetText(tooltip_text);
 
     SetTooltipBounds(curr_mouse_pos_, max_width,
                      tooltip_label_.GetPreferredSize().height());
     tooltip_widget_->Show();
   }
 }
 
 void TooltipManagerViews::SetTooltipBounds(gfx::Point mouse_pos,
                                            int tooltip_width,
                                            int tooltip_height) {
@@ skipping 23 matching lines @@
   if (tooltip_timer_.IsRunning())
     tooltip_timer_.Reset();
   curr_mouse_pos_.SetPoint(x, y);
 
   // If tooltip is visible, we may want to hide it. If it is not, we are ok.
   if (tooltip_widget_->IsVisible())
     UpdateIfRequired(curr_mouse_pos_.x(), curr_mouse_pos_.y(), false);
 }
 
 }  // namespace views