summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-09 13:32:29 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-09 13:32:29 +0000
commit851b1eb7c1ccf13b7fb7627bca78f7aefd03c67c (patch)
treea409d4ec9b6804999d0ea4bf25750d6e896f90ba /chrome/browser/renderer_host
parentb089b89cabbb56d499dcbe2ee070e20710d362ef (diff)
downloadchromium_src-851b1eb7c1ccf13b7fb7627bca78f7aefd03c67c.zip
chromium_src-851b1eb7c1ccf13b7fb7627bca78f7aefd03c67c.tar.gz
chromium_src-851b1eb7c1ccf13b7fb7627bca78f7aefd03c67c.tar.bz2
Disable outdated non-sandboxed plugins.
Relanding r55227, which had a compile error. BUG=47731 TEST=Run with --disable-outdated-plugins Review URL: http://codereview.chromium.org/3071028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/browser_render_process_host.cc1
-rw-r--r--chrome/browser/renderer_host/render_view_host.cc10
-rw-r--r--chrome/browser/renderer_host/render_view_host.h1
-rw-r--r--chrome/browser/renderer_host/render_view_host_delegate.h3
4 files changed, 15 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 3658a36..bee6232 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -574,6 +574,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
switches::kRemoteShellPort,
switches::kEnablePepperTesting,
switches::kBlockNonSandboxedPlugins,
+ switches::kDisableOutdatedPlugins,
switches::kEnableRemoting,
switches::kEnableClickToPlay,
switches::kPrelaunchGpuProcess,
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 80cacd1..5fa612e 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -802,6 +802,8 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
IPC_MESSAGE_HANDLER(ViewHostMsg_BlockedPluginLoaded,
OnBlockedPluginLoaded);
IPC_MESSAGE_HANDLER(ViewHostMsg_CrashedPlugin, OnCrashedPlugin);
+ IPC_MESSAGE_HANDLER(ViewHostMsg_DisabledOutdatedPlugin,
+ OnDisabledOutdatedPlugin);
IPC_MESSAGE_HANDLER(ViewHostMsg_SendCurrentPageAllSavableResourceLinks,
OnReceivedSavableResourceLinksForCurrentPage);
IPC_MESSAGE_HANDLER(ViewHostMsg_SendSerializedHtmlData,
@@ -1557,6 +1559,14 @@ void RenderViewHost::OnCrashedPlugin(const FilePath& plugin_path) {
integration_delegate->OnCrashedPlugin(plugin_path);
}
+void RenderViewHost::OnDisabledOutdatedPlugin(const string16& name,
+ const GURL& update_url) {
+ RenderViewHostDelegate::BrowserIntegration* integration_delegate =
+ delegate_->GetBrowserIntegrationDelegate();
+ if (integration_delegate)
+ integration_delegate->OnDisabledOutdatedPlugin(name, update_url);
+}
+
void RenderViewHost::GetAllSavableResourceLinksForCurrentPage(
const GURL& page_url) {
Send(new ViewMsg_GetAllSavableResourceLinksForCurrentPage(routing_id(),
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 0dbb82e..10a86b4 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -600,6 +600,7 @@ class RenderViewHost : public RenderWidgetHost {
void OnNonSandboxedPluginBlocked(const string16& name);
void OnBlockedPluginLoaded();
void OnCrashedPlugin(const FilePath& plugin_path);
+ void OnDisabledOutdatedPlugin(const string16& name, const GURL& update_url);
void OnReceivedSavableResourceLinksForCurrentPage(
const std::vector<GURL>& resources_list,
diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h
index b9a83f9..50ae915 100644
--- a/chrome/browser/renderer_host/render_view_host_delegate.h
+++ b/chrome/browser/renderer_host/render_view_host_delegate.h
@@ -245,6 +245,9 @@ class RenderViewHostDelegate {
// Notification that a worker process has crashed.
virtual void OnCrashedWorker() = 0;
+ virtual void OnDisabledOutdatedPlugin(const string16& name,
+ const GURL& update_url) = 0;
+
// Notification that a request for install info has completed.
virtual void OnDidGetApplicationInfo(
int32 page_id,