diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 01:43:56 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 01:43:56 +0000 |
| commit | d33e7cc3d6195681decd0787db8131eb614e7594 (patch) | |
| tree | 4e3fecbc3246bc583f98856e1150ff4a6f3d84de /chrome/browser/extensions/extension_content_settings_api.h | |
| parent | 6c16a36fff1052efef25d0045f0c6222b027a0eb (diff) | |
| download | chromium_src-d33e7cc3d6195681decd0787db8131eb614e7594.zip chromium_src-d33e7cc3d6195681decd0787db8131eb614e7594.tar.gz chromium_src-d33e7cc3d6195681decd0787db8131eb614e7594.tar.bz2 | |
Convert the PluginService interface to be an async wrapper around PluginList.
This adds additional methods to PluginService so that most callers can be moved
off PluginList and use the new asynchronous interface. This is in preparation
for moving plugin probing out-of-process on Mac and Linux.
BUG=17863,95114
TEST=none
Review URL: http://codereview.chromium.org/7980011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_content_settings_api.h')
| -rw-r--r-- | chrome/browser/extensions/extension_content_settings_api.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_content_settings_api.h b/chrome/browser/extensions/extension_content_settings_api.h index 25aca13..0330e5d 100644 --- a/chrome/browser/extensions/extension_content_settings_api.h +++ b/chrome/browser/extensions/extension_content_settings_api.h @@ -10,9 +10,7 @@ namespace webkit { namespace npapi { - -class PluginList; - +class PluginGroup; } } @@ -47,10 +45,11 @@ class GetResourceIdentifiersFunction : public AsyncExtensionFunction { FRIEND_TEST_ALL_PREFIXES(ExtensionApiTest, ContentSettingsGetResourceIdentifiers); - void GetPluginsOnFileThread(); + void OnGotPluginGroups(const std::vector<webkit::npapi::PluginGroup>& groups); // Used to override the global plugin list in tests. - static void SetPluginListForTesting(webkit::npapi::PluginList* plugin_list); + static void SetPluginGroupsForTesting( + const std::vector<webkit::npapi::PluginGroup>* plugin_groups); }; #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_API_H__ |