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

Side by Side Diff: chrome/browser/renderer_host/render_view_host.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, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_host/render_view_host.h" 5 #include "chrome/browser/renderer_host/render_view_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 void RenderViewHost::DragTargetDrop( 464 void RenderViewHost::DragTargetDrop(
465 const gfx::Point& client_pt, const gfx::Point& screen_pt) { 465 const gfx::Point& client_pt, const gfx::Point& screen_pt) {
466 Send(new ViewMsg_DragTargetDrop(routing_id(), client_pt, screen_pt)); 466 Send(new ViewMsg_DragTargetDrop(routing_id(), client_pt, screen_pt));
467 } 467 }
468 468
469 void RenderViewHost::ReservePageIDRange(int size) { 469 void RenderViewHost::ReservePageIDRange(int size) {
470 Send(new ViewMsg_ReservePageIDRange(routing_id(), size)); 470 Send(new ViewMsg_ReservePageIDRange(routing_id(), size));
471 } 471 }
472 472
473 void RenderViewHost::ExecuteJavascriptInWebFrame( 473 void RenderViewHost::ExecuteJavascriptInWebFrame(
474 const std::wstring& frame_xpath, 474 const string16& frame_xpath,
475 const std::wstring& jscript) { 475 const string16& jscript) {
476 Send(new ViewMsg_ScriptEvalRequest(routing_id(), WideToUTF16(frame_xpath), 476 Send(new ViewMsg_ScriptEvalRequest(routing_id(), frame_xpath, jscript,
477 WideToUTF16(jscript),
478 0, false)); 477 0, false));
479 } 478 }
480 479
481 int RenderViewHost::ExecuteJavascriptInWebFrameNotifyResult( 480 int RenderViewHost::ExecuteJavascriptInWebFrameNotifyResult(
482 const string16& frame_xpath, 481 const string16& frame_xpath,
483 const string16& jscript) { 482 const string16& jscript) {
484 static int next_id = 1; 483 static int next_id = 1;
485 Send(new ViewMsg_ScriptEvalRequest(routing_id(), frame_xpath, jscript, 484 Send(new ViewMsg_ScriptEvalRequest(routing_id(), frame_xpath, jscript,
486 next_id, true)); 485 next_id, true));
487 return next_id++; 486 return next_id++;
(...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after
1715 LOG(DFATAL) << "Invalid checked state " << checked_state; 1714 LOG(DFATAL) << "Invalid checked state " << checked_state;
1716 return; 1715 return;
1717 } 1716 }
1718 1717
1719 CommandState state; 1718 CommandState state;
1720 state.is_enabled = is_enabled; 1719 state.is_enabled = is_enabled;
1721 state.checked_state = 1720 state.checked_state =
1722 static_cast<RenderViewCommandCheckedState>(checked_state); 1721 static_cast<RenderViewCommandCheckedState>(checked_state);
1723 command_states_[static_cast<RenderViewCommand>(command)] = state; 1722 command_states_[static_cast<RenderViewCommand>(command)] = state;
1724 } 1723 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698