diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 09:30:28 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 09:30:28 +0000 |
| commit | 682ef685be471686d07513f4e44e59c9a71cf356 (patch) | |
| tree | 283cf7eda62b47bc86aa50782d1497b618d2b869 /content/common | |
| parent | bb035bc522fb7e7162ea6f5e12a80d86b5aa6a8d (diff) | |
| download | chromium_src-682ef685be471686d07513f4e44e59c9a71cf356.zip chromium_src-682ef685be471686d07513f4e44e59c9a71cf356.tar.gz chromium_src-682ef685be471686d07513f4e44e59c9a71cf356.tar.bz2 | |
Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo, to allow different sets of enabled/disabled plug-ins to be specified per profile.
BUG=80794
TEST=Open two profiles, disable different plugins in them.
Review URL: http://codereview.chromium.org/7848025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/pepper_plugin_registry.cc | 13 | ||||
| -rw-r--r-- | content/common/pepper_plugin_registry.h | 3 | ||||
| -rw-r--r-- | content/common/view_messages.h | 1 |
3 files changed, 1 insertions, 16 deletions
diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc index 9fb1381..5bb2f29 100644 --- a/content/common/pepper_plugin_registry.cc +++ b/content/common/pepper_plugin_registry.cc @@ -89,22 +89,12 @@ webkit::WebPluginInfo PepperPluginInfo::ToWebPluginInfo() const { info.desc = ASCIIToUTF16(description); info.mime_types = mime_types; - webkit::WebPluginInfo::EnabledStates enabled_state = - webkit::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED; - - if (!enabled) { - enabled_state = - webkit::WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED; - } - - info.enabled = enabled_state; return info; } PepperPluginInfo::PepperPluginInfo() : is_internal(false), - is_out_of_process(false), - enabled(true) { + is_out_of_process(false) { } PepperPluginInfo::~PepperPluginInfo() { @@ -119,7 +109,6 @@ bool MakePepperPluginInfo(const webkit::WebPluginInfo& webplugin_info, webplugin_info.type == webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS; - pepper_info->enabled = webkit::IsPluginEnabled(webplugin_info); pepper_info->path = FilePath(webplugin_info.path); pepper_info->name = UTF16ToASCII(webplugin_info.name); pepper_info->description = UTF16ToASCII(webplugin_info.desc); diff --git a/content/common/pepper_plugin_registry.h b/content/common/pepper_plugin_registry.h index ee2404a4..b3b94ab 100644 --- a/content/common/pepper_plugin_registry.h +++ b/content/common/pepper_plugin_registry.h @@ -33,9 +33,6 @@ struct CONTENT_EXPORT PepperPluginInfo { // True when this plugin should be run out of process. Defaults to false. bool is_out_of_process; - // Whether the plugin is enabled. Defaults to true. - bool enabled; - FilePath path; // Internal plugins have "internal-[name]" as path. std::string name; std::string description; diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 1165ffc..e2612c2e 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -466,7 +466,6 @@ IPC_STRUCT_TRAITS_BEGIN(webkit::WebPluginInfo) IPC_STRUCT_TRAITS_MEMBER(version) IPC_STRUCT_TRAITS_MEMBER(desc) IPC_STRUCT_TRAITS_MEMBER(mime_types) - IPC_STRUCT_TRAITS_MEMBER(enabled) IPC_STRUCT_TRAITS_MEMBER(type) IPC_STRUCT_TRAITS_END() |