summaryrefslogtreecommitdiffstats
path: root/chrome/browser/remoting
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 15:42:00 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 15:42:00 +0000
commit7024d3eea1d8328883736f5cd3cbef480aa0e740 (patch)
tree5fc40e7da24d79306321037359bce7bd97bcf36b /chrome/browser/remoting
parente9ff5e31b28b6ee684ceaf47afe4f483163f6d1d (diff)
downloadchromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.zip
chromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.tar.gz
chromium_src-7024d3eea1d8328883736f5cd3cbef480aa0e740.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/6312154 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74118 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 7e0c1bc..ba43543 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) {