summaryrefslogtreecommitdiffstats
path: root/chrome/browser/remoting
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 22:57:43 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 22:57:43 +0000
commit548bc0f318c74e9a69973cb43c5403d03d114b52 (patch)
treeab09daafc56330f21985c85eabe8adfc671ab7a6 /chrome/browser/remoting
parent5963b7759a369d178866bdc5868bb601dc5ee262 (diff)
downloadchromium_src-548bc0f318c74e9a69973cb43c5403d03d114b52.zip
chromium_src-548bc0f318c74e9a69973cb43c5403d03d114b52.tar.gz
chromium_src-548bc0f318c74e9a69973cb43c5403d03d114b52.tar.bz2
Remove wstring from RVH's run Javascript command.
BUG=23581 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6458013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/remoting')
-rw-r--r--chrome/browser/remoting/setup_flow.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/remoting/setup_flow.cc b/chrome/browser/remoting/setup_flow.cc
index 918855a..29052f2 100644
--- a/chrome/browser/remoting/setup_flow.cc
+++ b/chrome/browser/remoting/setup_flow.cc
@@ -55,7 +55,8 @@ void SetupFlowStepBase::ExecuteJavascriptInIFrame(
DCHECK(dom_ui);
RenderViewHost* rvh = dom_ui->tab_contents()->render_view_host();
- rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js);
+ rvh->ExecuteJavascriptInWebFrame(WideToUTF16Hack(iframe_xpath),
+ WideToUTF16Hack(js));
}
void SetupFlowStepBase::FinishStep(SetupFlowStep* next_step) {