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

Side by Side Diff: chrome/browser/renderer_host/render_view_host.h

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 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 const gfx::Point& screen_pt, 254 const gfx::Point& screen_pt,
255 WebKit::WebDragOperationsMask operations_allowed); 255 WebKit::WebDragOperationsMask operations_allowed);
256 void DragTargetDragLeave(); 256 void DragTargetDragLeave();
257 void DragTargetDrop(const gfx::Point& client_pt, 257 void DragTargetDrop(const gfx::Point& client_pt,
258 const gfx::Point& screen_pt); 258 const gfx::Point& screen_pt);
259 259
260 // Tell the RenderView to reserve a range of page ids of the given size. 260 // Tell the RenderView to reserve a range of page ids of the given size.
261 void ReservePageIDRange(int size); 261 void ReservePageIDRange(int size);
262 262
263 // Runs some javascript within the context of a frame in the page. 263 // Runs some javascript within the context of a frame in the page.
264 void ExecuteJavascriptInWebFrame(const std::wstring& frame_xpath, 264 void ExecuteJavascriptInWebFrame(const string16& frame_xpath,
265 const std::wstring& jscript); 265 const string16& jscript);
266 266
267 // Runs some javascript within the context of a frame in the page. The result 267 // Runs some javascript within the context of a frame in the page. The result
268 // is sent back via the notification EXECUTE_JAVASCRIPT_RESULT. 268 // is sent back via the notification EXECUTE_JAVASCRIPT_RESULT.
269 int ExecuteJavascriptInWebFrameNotifyResult(const string16& frame_xpath, 269 int ExecuteJavascriptInWebFrameNotifyResult(const string16& frame_xpath,
270 const string16& jscript); 270 const string16& jscript);
271 271
272 // Insert some css into a frame in the page. |id| is optional, and specifies 272 // Insert some css into a frame in the page. |id| is optional, and specifies
273 // the element id given when inserting/replacing the style element. 273 // the element id given when inserting/replacing the style element.
274 void InsertCSSInWebFrame(const std::wstring& frame_xpath, 274 void InsertCSSInWebFrame(const std::wstring& frame_xpath,
275 const std::string& css, 275 const std::string& css,
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 // The termination status of the last render view that terminated. 730 // The termination status of the last render view that terminated.
731 base::TerminationStatus render_view_termination_status_; 731 base::TerminationStatus render_view_termination_status_;
732 732
733 // The enabled/disabled states of various commands. 733 // The enabled/disabled states of various commands.
734 std::map<RenderViewCommand, CommandState> command_states_; 734 std::map<RenderViewCommand, CommandState> command_states_;
735 735
736 DISALLOW_COPY_AND_ASSIGN(RenderViewHost); 736 DISALLOW_COPY_AND_ASSIGN(RenderViewHost);
737 }; 737 };
738 738
739 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_ 739 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698