| Index: chrome/browser/plugins/plugin_info_message_filter.h
|
| diff --git a/chrome/browser/plugins/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h
|
| index c9987c5573e4306d32363541be5dc79deeb55e24..bcedfc377c78454262cbb82e2e116dd254618795 100644
|
| --- a/chrome/browser/plugins/plugin_info_message_filter.h
|
| +++ b/chrome/browser/plugins/plugin_info_message_filter.h
|
| @@ -63,6 +63,7 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter {
|
| bool* is_managed) const;
|
| void MaybeGrantAccess(const ChromeViewHostMsg_GetPluginInfo_Status& status,
|
| const base::FilePath& path) const;
|
| + bool IsPluginEnabled(const content::WebPluginInfo& plugin) const;
|
|
|
| private:
|
| int render_process_id_;
|
| @@ -100,15 +101,16 @@ class PluginInfoMessageFilter : public content::BrowserMessageFilter {
|
| const std::vector<content::WebPluginInfo>& plugins);
|
|
|
| #if defined(ENABLE_PEPPER_CDMS)
|
| - // Returns whether any internal plugin supporting |mime_type| is registered.
|
| - // Does not determine whether the plugin can actually be instantiated
|
| - // (e.g. whether it is allowed or has all its dependencies).
|
| - // When the returned *|is_registered| is true, |additional_param_names| and
|
| + // Returns whether any internal plugin supporting |mime_type| is registered
|
| + // and enabled. Does not determine whether the plugin can actually be
|
| + // instantiated (e.g. whether it has all its dependencies).
|
| + // When the returned *|is_available| is true, |additional_param_names| and
|
| // |additional_param_values| contain the name-value pairs, if any, specified
|
| - // for the *first* plugin found that is registered for |mime_type|.
|
| - void OnIsInternalPluginRegisteredForMimeType(
|
| + // for the *first* non-disabled plugin found that is registered for
|
| + // |mime_type|.
|
| + void OnIsInternalPluginAvailableForMimeType(
|
| const std::string& mime_type,
|
| - bool* is_registered,
|
| + bool* is_available,
|
| std::vector<base::string16>* additional_param_names,
|
| std::vector<base::string16>* additional_param_values);
|
| #endif
|
|
|