Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(915)

Unified Diff: chrome/browser/plugin_data_remover.cc

Issue 7477044: Use PluginPrefs in ChromePluginServiceFilter to check whether a plugin is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/plugin_data_remover.h ('k') | chrome/browser/plugin_data_remover_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugin_data_remover.cc
diff --git a/chrome/browser/plugin_data_remover.cc b/chrome/browser/plugin_data_remover.cc
index e17254e763163a43daa933325a8c547bc103ac5f..b97d2f73f17c6f527bbba3019251b456334a31a2 100644
--- a/chrome/browser/plugin_data_remover.cc
+++ b/chrome/browser/plugin_data_remover.cc
@@ -9,6 +9,7 @@
#include "base/metrics/histogram.h"
#include "base/synchronization/waitable_event.h"
#include "base/version.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_switches.h"
#include "content/browser/browser_thread.h"
#include "content/browser/plugin_service.h"
@@ -30,9 +31,10 @@ const uint64 kClearAllData = 0;
} // namespace
-PluginDataRemover::PluginDataRemover()
+PluginDataRemover::PluginDataRemover(Profile* profile)
: mime_type_(kFlashMimeType),
is_removing_(false),
+ context_(profile->GetResourceContext()),
event_(new base::WaitableEvent(true, false)),
channel_(NULL) {
}
@@ -54,7 +56,7 @@ base::WaitableEvent* PluginDataRemover::StartRemoving(base::Time begin_time) {
// called, so we need to keep this object around until then.
AddRef();
PluginService::GetInstance()->OpenChannelToNpapiPlugin(
- 0, 0, GURL(), mime_type_, this);
+ 0, 0, GURL(), GURL(), mime_type_, this);
BrowserThread::PostDelayedTask(
BrowserThread::IO,
@@ -86,6 +88,10 @@ bool PluginDataRemover::OffTheRecord() {
return false;
}
+const content::ResourceContext& PluginDataRemover::GetResourceContext() {
+ return context_;
+}
+
void PluginDataRemover::SetPluginInfo(
const webkit::npapi::WebPluginInfo& info) {
}
« no previous file with comments | « chrome/browser/plugin_data_remover.h ('k') | chrome/browser/plugin_data_remover_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698