diff options
Diffstat (limited to 'webkit/plugins/webplugininfo.cc')
| -rw-r--r-- | webkit/plugins/webplugininfo.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/webkit/plugins/webplugininfo.cc b/webkit/plugins/webplugininfo.cc index 0bdc255..031dd40 100644 --- a/webkit/plugins/webplugininfo.cc +++ b/webkit/plugins/webplugininfo.cc @@ -22,8 +22,7 @@ WebPluginMimeType::WebPluginMimeType(const std::string& m, WebPluginMimeType::~WebPluginMimeType() {} -WebPluginInfo::WebPluginInfo() - : enabled(USER_DISABLED_POLICY_UNMANAGED), type(PLUGIN_TYPE_NPAPI) { +WebPluginInfo::WebPluginInfo() : type(PLUGIN_TYPE_NPAPI) { } WebPluginInfo::WebPluginInfo(const WebPluginInfo& rhs) @@ -32,7 +31,6 @@ WebPluginInfo::WebPluginInfo(const WebPluginInfo& rhs) version(rhs.version), desc(rhs.desc), mime_types(rhs.mime_types), - enabled(rhs.enabled), type(rhs.type) { } @@ -44,7 +42,6 @@ WebPluginInfo& WebPluginInfo::operator=(const WebPluginInfo& rhs) { version = rhs.version; desc = rhs.desc; mime_types = rhs.mime_types; - enabled = rhs.enabled; type = rhs.type; return *this; } @@ -58,15 +55,9 @@ WebPluginInfo::WebPluginInfo(const string16& fake_name, version(fake_version), desc(fake_desc), mime_types(), - enabled(USER_ENABLED_POLICY_UNMANAGED), type(PLUGIN_TYPE_NPAPI) { } -bool IsPluginEnabled(const WebPluginInfo& plugin) { - return ((plugin.enabled & WebPluginInfo::POLICY_ENABLED) || - plugin.enabled == WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED); -} - bool IsPepperPlugin(const WebPluginInfo& plugin) { return ((plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS ) || plugin.type == WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS); |