Revert 71167 - Remove wstring from gfx....

chrome/browser/chromeos/dom_ui/menu_ui.cc

 // 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.
 
 #include "chrome/browser/chromeos/dom_ui/menu_ui.h"
 
 #include <algorithm>
 
 #include "app/menus/menu_model.h"
 #include "app/resource_bundle.h"
@@ skipping 25 matching lines @@
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/radio_button_image_gtk.h"
 #include "views/widget/widget_gtk.h"
 
 namespace {
 
 // a fake resource id for not loading extra resource.
 const int kNoExtraResource = -1;
 
 // A utility function that generates css font property from gfx::Font.
-// NOTE: Returns UTF-8.
-std::string GetFontShorthand(const gfx::Font* font) {
-  std::string out;
+std::wstring GetFontShorthand(const gfx::Font* font) {
+  std::wstring out;
   if (font == NULL) {
     font = &(views::MenuConfig::instance().font);
   }
   if (font->GetStyle() & gfx::Font::BOLD) {
-    out.append("bold ");
+    out.append(L"bold ");
   }
   if (font->GetStyle() & gfx::Font::ITALIC) {
-    out.append("italic ");
+    out.append(L"italic ");
   }
   if (font->GetStyle() & gfx::Font::UNDERLINED) {
-    out.append("underline ");
+    out.append(L"underline ");
   }
 
   // TODO(oshima): The font size from gfx::Font is too small when
   // used in webkit. Figure out the reason.
-  out.append(base::IntToString(font->GetFontSize() + 4));
-  out.append("px/");
-  out.append(base::IntToString(std::max(kFavIconSize, font->GetHeight())));
-  out.append("px \"");
-  out.append(UTF16ToUTF8(font->GetFontName()));
-  out.append("\",sans-serif");
+  out.append(ASCIIToWide(base::IntToString(font->GetFontSize() + 4)));
+  out.append(L"px/");
+  out.append(ASCIIToWide(base::IntToString(
+      std::max(kFavIconSize, font->GetHeight()))));
+  out.append(L"px \"");
+  out.append(font->GetFontName());
+  out.append(L"\",sans-serif");
   return out;
 }
 
 // Creates scroll button's up image when |up| is true or
 // down image if |up| is false.
 SkBitmap CreateMenuScrollArrowImage(bool up) {
   const views::MenuConfig& config = views::MenuConfig::instance();
 
   int height = config.scroll_arrow_height;
   gfx::CanvasSkia canvas(height * 2, height, false);
@@ skipping 532 matching lines @@
   string16 label16 = model->GetLabelAt(index);
   DictionaryValue* item = new DictionaryValue();
 
   item->SetString("type", type);
   item->SetString("label", label16);
   item->SetBoolean("enabled", model->IsEnabledAt(index));
   item->SetBoolean("visible", model->IsVisibleAt(index));
   item->SetBoolean("checked", model->IsItemCheckedAt(index));
   item->SetInteger("command_id", model->GetCommandIdAt(index));
   item->SetString(
-      "font", GetFontShorthand(model->GetLabelFontAt(index)));
+      "font", WideToUTF16(GetFontShorthand(model->GetLabelFontAt(index))));
   SkBitmap icon;
   if (model->GetIconAt(index, &icon) && !icon.isNull() && !icon.empty()) {
     item->SetString("icon", dom_ui_util::GetImageDataUrl(icon));
     *max_icon_width = std::max(*max_icon_width, icon.width());
   }
   views::Accelerator menu_accelerator;
   if (model->GetAcceleratorAt(index, &menu_accelerator)) {
     item->SetString("accel", menu_accelerator.GetShortcutText());
     *has_accel = true;
   }
@@ skipping 22 matching lines @@
 
 ChromeURLDataManager::DataSource* MenuUI::CreateDataSource() {
   return CreateMenuUIHTMLSource(NULL,
                                 chrome::kChromeUIMenu,
                                 "Menu" /* class name */,
                                 kNoExtraResource,
                                 kNoExtraResource);
 }
 
 }  // namespace chromeos