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

Unified Diff: chrome/browser/plugins/chrome_plugin_service_filter.h

Issue 2234133003: [HBD] Call PurgePluginListCache() whenever plugin content settings change (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hbd_exceptions
Patch Set: Changes per bauerb@'s comments Created 4 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
Index: chrome/browser/plugins/chrome_plugin_service_filter.h
diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.h b/chrome/browser/plugins/chrome_plugin_service_filter.h
index f3876e145a6ed4307b0d7a47c37183b874932599..eaffc59fc744bb789086a1e26702ce8d5624eb72 100644
--- a/chrome/browser/plugins/chrome_plugin_service_filter.h
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.h
@@ -6,7 +6,9 @@
#define CHROME_BROWSER_PLUGINS_CHROME_PLUGIN_SERVICE_FILTER_H_
#include <map>
+#include <memory>
#include <set>
+#include <string>
#include <vector>
#include "base/containers/hash_tables.h"
@@ -40,6 +42,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
void RegisterResourceContext(
scoped_refptr<PluginPrefs> plugin_prefs,
scoped_refptr<HostContentSettingsMap> host_content_settings_map,
+ Profile* profile,
const void* context);
void UnregisterResourceContext(const void* context);
@@ -77,6 +80,8 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
const base::FilePath& path) override;
private:
+ class ProfileContentSettingObserver;
tommycli 2016/08/15 19:25:11 I think this can just be a class within the anonym
trizzofo 2016/08/15 20:35:58 Done.
+ struct ContextInfo;
friend struct base::DefaultSingletonTraits<ChromePluginServiceFilter>;
struct OverriddenPlugin {
@@ -111,11 +116,8 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
content::NotificationRegistrar registrar_;
base::Lock lock_; // Guards access to member variables.
- typedef std::map<const void*, scoped_refptr<PluginPrefs> > ResourceContextMap;
- ResourceContextMap plugin_prefs_;
- std::map<const void*, scoped_refptr<HostContentSettingsMap>>
- host_content_settings_maps_;
+ std::map<const void*, std::unique_ptr<ContextInfo>> resource_context_map_;
std::map<int, ProcessDetails> plugin_details_;
};
« no previous file with comments | « no previous file | chrome/browser/plugins/chrome_plugin_service_filter.cc » ('j') | chrome/browser/profiles/profile_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698