From 610c089bd27051ca8d2b983e784b31c533cbfef8 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Tue, 8 Sep 2009 19:46:18 +0000 Subject: Take out the activex control.BUG=20259 Review URL: http://codereview.chromium.org/200031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25650 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/renderer_host/browser_render_process_host.cc | 1 - chrome/browser/renderer_host/buffered_resource_handler.cc | 2 +- chrome/browser/renderer_host/resource_message_filter.cc | 6 ++---- chrome/browser/renderer_host/resource_message_filter.h | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) (limited to 'chrome/browser/renderer_host') diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 65b948a5..25bb3d4 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -327,7 +327,6 @@ bool BrowserRenderProcessHost::Init() { switches::kDisableLogging, switches::kLoggingLevel, switches::kDebugPrint, - switches::kAllowAllActiveX, switches::kMemoryProfiling, switches::kEnableWatchdog, switches::kMessageLoopHistogrammer, diff --git a/chrome/browser/renderer_host/buffered_resource_handler.cc b/chrome/browser/renderer_host/buffered_resource_handler.cc index 53e78097..641f577 100644 --- a/chrome/browser/renderer_host/buffered_resource_handler.cc +++ b/chrome/browser/renderer_host/buffered_resource_handler.cc @@ -419,7 +419,7 @@ bool BufferedResourceHandler::ShouldDownload(bool* need_plugin_list) { WebPluginInfo info; bool allow_wildcard = false; return !NPAPI::PluginList::Singleton()->GetPluginInfo( - GURL(), type, "", allow_wildcard, &info, NULL); + GURL(), type, allow_wildcard, &info, NULL); } void BufferedResourceHandler::LoadPlugins(BufferedResourceHandler* handler, diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index 059f2af..ed4a525 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -552,20 +552,18 @@ void ResourceMessageFilter::OnPluginsLoaded(IPC::Message* reply_msg) { void ResourceMessageFilter::OnGetPluginPath(const GURL& url, const GURL& policy_url, const std::string& mime_type, - const std::string& clsid, FilePath* filename, std::string* url_mime_type) { *filename = plugin_service_->GetPluginPath( - url, policy_url, mime_type, clsid, url_mime_type); + url, policy_url, mime_type, url_mime_type); } void ResourceMessageFilter::OnOpenChannelToPlugin(const GURL& url, const std::string& mime_type, - const std::string& clsid, const std::wstring& locale, IPC::Message* reply_msg) { plugin_service_->OpenChannelToPlugin( - this, url, mime_type, clsid, locale, reply_msg); + this, url, mime_type, locale, reply_msg); } void ResourceMessageFilter::OnCreateDedicatedWorker(const GURL& url, diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h index 7fd7979..feb1e54 100644 --- a/chrome/browser/renderer_host/resource_message_filter.h +++ b/chrome/browser/renderer_host/resource_message_filter.h @@ -145,12 +145,10 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter, void OnGetPluginPath(const GURL& url, const GURL& policy_url, const std::string& mime_type, - const std::string& clsid, FilePath* filename, std::string* actual_mime_type); void OnOpenChannelToPlugin(const GURL& url, const std::string& mime_type, - const std::string& clsid, const std::wstring& locale, IPC::Message* reply_msg); void OnCreateDedicatedWorker(const GURL& url, -- cgit v1.1