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

chrome/browser/ui/views/wrench_menu.cc

Index: chrome/browser/ui/views/wrench_menu.cc
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index 3c3c20c2a50e24af4c8eeca710936e39bb6d1f35..5d546d962dc5c8c52185f87ceef078d15b3d1488 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -4,7 +4,9 @@
 
 #include "chrome/browser/ui/views/wrench_menu.h"
 
+#include <algorithm>
 #include <cmath>
+#include <set>
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ -396,7 +398,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView,
         NULL, IDS_ACCNAME_ZOOM_MINUS2);
 
     zoom_label_ = new Label(
-        UTF16ToWide(l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, 100)));
+        l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, 100));
     zoom_label_->SetColor(MenuConfig::instance().text_color);
     zoom_label_->SetHorizontalAlignment(Label::ALIGN_RIGHT);
     MenuButtonBackground* center_bg =
@@ -502,9 +504,8 @@ class WrenchMenu::ZoomView : public WrenchMenuView,
       zoom = selected_tab->GetZoomPercent(&enable_increment, &enable_decrement);
     increment_button_->SetEnabled(enable_increment);
     decrement_button_->SetEnabled(enable_decrement);
-    zoom_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16Int(
-                                     IDS_ZOOM_PERCENT,
-                                     zoom)));
+    zoom_label_->SetText(
+        l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, zoom));
 
     zoom_label_width_ = MaxWidthForZoomLabel();
   }