Remove wstring from RVH's run Javascript command....

chrome/browser/chromeos/views/webui_menu_widget.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 "chrome/browser/chromeos/views/webui_menu_widget.h"
 
 #include <algorithm>
 
 #include "base/stringprintf.h"
 #include "base/singleton.h"
 #include "base/task.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/views/menu_locator.h"
 #include "chrome/browser/chromeos/views/native_menu_webui.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "chrome/common/url_constants.h"
 #include "gfx/canvas_skia.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "views/border.h"
 #include "views/layout/layout_manager.h"
 #include "views/widget/root_view.h"
 
 namespace {
 
-// Colors for menu's graident background.
+// Colors for the menu's gradient background.
 const SkColor kMenuStartColor = SK_ColorWHITE;
 const SkColor kMenuEndColor = 0xFFEEEEEE;
 
 // Rounded border for menu. This draws three types of rounded border,
 // for context menu, dropdown menu and submenu. Please see
 // menu_locator.cc for details.
 class RoundedBorder : public views::Border {
  public:
   explicit RoundedBorder(chromeos::MenuLocator* locator)
       : menu_locator_(locator) {
   }
 
  private:
-  // views::Border implementatios.
+  // views::Border implementations.
   virtual void Paint(const views::View& view, gfx::Canvas* canvas) const {
     const SkScalar* corners = menu_locator_->GetCorners();
     // The menu is in off screen so no need to draw corners.
     if (!corners)
       return;
     int w = view.width();
     int h = view.height();
     SkRect rect = {0, 0, w, h};
     SkPath path;
     path.addRoundRect(rect, corners);
@@ skipping 18 matching lines @@
   chromeos::MenuLocator* menu_locator_;  // not owned
 
   DISALLOW_COPY_AND_ASSIGN(RoundedBorder);
 };
 
 class InsetsLayout : public views::LayoutManager {
  public:
   InsetsLayout() : views::LayoutManager() {}
 
  private:
-  // views::LayoutManager implementatios.
+  // views::LayoutManager implementations.
   virtual void Layout(views::View* host) {
     if (host->GetChildViewCount() == 0)
       return;
     gfx::Insets insets = host->GetInsets();
     views::View* view = host->GetChildViewAt(0);
 
     view->SetBounds(insets.left(), insets.top(),
                     host->width() - insets.width(),
                     host->height() - insets.height());
   }
@@ skipping 152 matching lines @@
 
 void WebUIMenuWidget::ExecuteJavascript(const std::wstring& script) {
   // Don't execute if there is no DOMView associated. This is fine because
   // 1) selectItem make sense only when DOMView is associated.
   // 2) updateModel will be called again when a DOMView is created/assigned.
   if (!dom_view_)
     return;
 
   DCHECK(dom_view_->tab_contents()->render_view_host());
   dom_view_->tab_contents()->render_view_host()->
-      ExecuteJavascriptInWebFrame(std::wstring(), script);
+      ExecuteJavascriptInWebFrame(string16(), WideToUTF16Hack(script));
 }
 
 void WebUIMenuWidget::ShowAt(chromeos::MenuLocator* locator) {
   DCHECK(webui_menu_);
   menu_locator_.reset(locator);
   if (!dom_view_) {
     // TODO(oshima): Replace DOMView with direct use of RVH for beta.
     // DOMView should be refactored to use RVH directly, but
     // it'll require a lot of change and will take time.
     dom_view_ = new DOMView();
@@ skipping 64 matching lines @@
   EnableInput(false /* no selection */);
 }
 
 void WebUIMenuWidget::ClearGrabWidget() {
   GtkWidget* grab_widget;
   while ((grab_widget = gtk_grab_get_current()))
     gtk_grab_remove(grab_widget);
 }
 
 }   // namespace chromeos