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 19:56:14 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 19:56:14 +0000
commita771dc3feb97ae20170cf5617ba48d6340549698 (patch)
tree2482dd2533a3341ede166407b6eb3761a28ec4e7 /chrome/browser/remoting
parent0f786468a0c44da5093c6759915e1c0384535adf (diff)
downloadchromium_src-a771dc3feb97ae20170cf5617ba48d6340549698.zip
chromium_src-a771dc3feb97ae20170cf5617ba48d6340549698.tar.gz
chromium_src-a771dc3feb97ae20170cf5617ba48d6340549698.tar.bz2
Revert 74118 - Remove wstring from RVH's run Javascript command.
BUG=23581 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6312154 TBR=avi@chromium.org Review URL: http://codereview.chromium.org/6459002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/remoting')
-rw-r--r--chrome/browser/remoting/setup_flow.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/remoting/setup_flow.cc b/chrome/browser/remoting/setup_flow.cc
index ba43543..7e0c1bc 100644
--- a/chrome/browser/remoting/setup_flow.cc
+++ b/chrome/browser/remoting/setup_flow.cc
@@ -55,8 +55,7 @@ void SetupFlowStepBase::ExecuteJavascriptInIFrame(
DCHECK(dom_ui);
RenderViewHost* rvh = dom_ui->tab_contents()->render_view_host();
- rvh->ExecuteJavascriptInWebFrame(WideToUTF16Hack(iframe_xpath),
- WideToUTF16Hack(js));
+ rvh->ExecuteJavascriptInWebFrame(iframe_xpath, js);
}
void SetupFlowStepBase::FinishStep(SetupFlowStep* next_step) {