From 1f5af444f94761190a16ac6088ad6e6831aeb4a0 Mon Sep 17 00:00:00 2001 From: "brettw@google.com" Date: Thu, 25 Sep 2008 22:11:06 +0000 Subject: 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 --- chrome/browser/automation/automation_provider.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'chrome/browser/automation') 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)); -- cgit v1.1