Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: chrome/browser/chromeos/views/webui_menu_widget.cc

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/views/webui_menu_widget.cc
===================================================================
--- chrome/browser/chromeos/views/webui_menu_widget.cc (revision 73855)
+++ chrome/browser/chromeos/views/webui_menu_widget.cc (working copy)
@@ -9,6 +9,7 @@
#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"
@@ -27,7 +28,7 @@
namespace {
-// Colors for menu's graident background.
+// Colors for the menu's gradient background.
const SkColor kMenuStartColor = SK_ColorWHITE;
const SkColor kMenuEndColor = 0xFFEEEEEE;
@@ -41,7 +42,7 @@
}
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.
@@ -80,7 +81,7 @@
InsetsLayout() : views::LayoutManager() {}
private:
- // views::LayoutManager implementatios.
+ // views::LayoutManager implementations.
virtual void Layout(views::View* host) {
if (host->GetChildViewCount() == 0)
return;
@@ -253,7 +254,7 @@
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) {

Powered by Google App Engine
This is Rietveld 408576698