chrome/browser/extensions/extension_content_settings_api.h - Issue 7980011: Convert the PluginService interface to be an async wrapper around PluginList.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_content_settings_api.h

Issue 7980011: Convert the PluginService interface to be an async wrapper around PluginList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments Created 9 years, 3 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

« no previous file with comments | « chrome/browser/automation/testing_automation_provider.cc ('k') | chrome/browser/extensions/extension_content_settings_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_content_settings_api.h

diff --git a/chrome/browser/extensions/extension_content_settings_api.h b/chrome/browser/extensions/extension_content_settings_api.h

index 25aca13560efedbf05b6fb4ab530f0a45126d929..0330e5dcbfe6dc569b2a98e77ce87c94cb9cdd14 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__