summaryrefslogtreecommitdiffstats
path: root/chrome/browser/automation
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 02:09:33 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 02:09:33 +0000
commit53a0afa4218c19221e2df65b664a7d42f72fc2e0 (patch)
tree5655172bbc9f1d756c5d2c2cf65119679255715c /chrome/browser/automation
parentf4d5e1ae2530667dc52bcce555e70e47bdc37371 (diff)
downloadchromium_src-53a0afa4218c19221e2df65b664a7d42f72fc2e0.zip
chromium_src-53a0afa4218c19221e2df65b664a7d42f72fc2e0.tar.gz
chromium_src-53a0afa4218c19221e2df65b664a7d42f72fc2e0.tar.bz2
Move a few Chrome messages out of RenderViewHost. I added ChromeRenderViewHostObserver, to be the browser equivalent of the renderer's ChromeRenderViewObserver, where we have a place to dispatch RV messages specific to Chrome.
Review URL: http://codereview.chromium.org/6883177 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
-rw-r--r--chrome/browser/automation/automation_provider.cc4
-rw-r--r--chrome/browser/automation/automation_provider_win.cc4
-rw-r--r--chrome/browser/automation/testing_automation_provider.cc4
3 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 0239d65..4770701 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -83,6 +83,7 @@
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/pref_names.h"
+#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/automation/tab_proxy.h"
#include "content/browser/browser_thread.h"
@@ -738,7 +739,8 @@ void AutomationProvider::JavaScriptStressTestControl(int tab_handle,
return;
}
- view->JavaScriptStressTestControl(cmd, param);
+ view->Send(new ViewMsg_JavaScriptStressTestControl(
+ view->routing_id(), cmd, param));
}
RenderViewHost* AutomationProvider::GetViewForTab(int tab_handle) {
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc
index b188c04..c764004 100644
--- a/chrome/browser/automation/automation_provider_win.cc
+++ b/chrome/browser/automation/automation_provider_win.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
#include "chrome/common/automation_messages.h"
+#include "chrome/common/render_messages.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/common/page_zoom.h"
@@ -421,7 +422,8 @@ void AutomationProvider::OnMessageFromExternalHost(int handle,
if (!view_host)
return;
- view_host->ForwardMessageFromExternalHost(message, origin, target);
+ view_host->Send(new ViewMsg_HandleMessageFromExternalHost(
+ view_host->routing_id(), message, origin, target));
}
void AutomationProvider::NavigateInExternalTab(
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 615297d..65eb3a8 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -89,6 +89,7 @@
#include "chrome/common/extensions/extension_extent.h"
#include "chrome/common/extensions/url_pattern.h"
#include "chrome/common/pref_names.h"
+#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/renderer_host/render_view_host.h"
@@ -5613,7 +5614,8 @@ void TestingAutomationProvider::LoadBlockedPlugins(int tab_handle,
TabContents* contents = nav->tab_contents();
if (!contents)
return;
- contents->render_view_host()->LoadBlockedPlugins();
+ RenderViewHost* host = contents->render_view_host();
+ host->Send(new ViewMsg_LoadBlockedPlugins(host->routing_id()));
*success = true;
}
}