summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-25 22:11:06 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-25 22:11:06 +0000
commit1f5af444f94761190a16ac6088ad6e6831aeb4a0 (patch)
tree6c89513715320dacc744a49e0e2104a4ee3e9807 /chrome/browser/automation
parentde8d2667d6953abb31b7c5385ca718ad47adf6a1 (diff)
downloadchromium_src-1f5af444f94761190a16ac6088ad6e6831aeb4a0.zip
chromium_src-1f5af444f94761190a16ac6088ad6e6831aeb4a0.tar.gz
chromium_src-1f5af444f94761190a16ac6088ad6e6831aeb4a0.tar.bz2
Move a bunch of stuff out of WebContents. I removed a bunch of render view host pass-throughs and just made the callers call the render view host directly. I don't think we're trying to isolate the layers to this degree, and WebContents is so big these just added noise.
I removed the RenderViewHost->WebContents->SavePackage pass-through by using a delegate that the SavePackage implements (like we already do for find in page). I also noticed some file upload stuff wasn't used at all and removed it. Review URL: http://codereview.chromium.org/4088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/automation_provider.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 8c2da33..7b4f600 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -1591,8 +1591,10 @@ void AutomationProvider::ExecuteJavascript(const IPC::Message& message,
L"javascript:void(window.domAutomationController.setAutomationId(%d));",
message.routing_id());
- web_contents->ExecuteJavascriptInWebFrame(frame_xpath, url);
- web_contents->ExecuteJavascriptInWebFrame(frame_xpath, script);
+ web_contents->render_view_host()->ExecuteJavascriptInWebFrame(
+ frame_xpath, url);
+ web_contents->render_view_host()->ExecuteJavascriptInWebFrame(
+ frame_xpath, script);
succeeded = true;
}
@@ -1768,7 +1770,7 @@ void AutomationProvider::HandleInspectElementRequest(
const IPC::Message& message, int handle, int x, int y) {
WebContents* web_contents = GetWebContentsForHandle(handle, NULL);
if (web_contents) {
- web_contents->InspectElementAt(x, y);
+ web_contents->render_view_host()->InspectElementAt(x, y);
inspect_element_routing_id_ = message.routing_id();
} else {
Send(new AutomationMsg_InspectElementResponse(message.routing_id(), -1));