chrome/browser/extensions/api/content_settings/content_settings_api.h - Issue 10910168: Separate plugin_metadata from plugin_installer, thread-safe plugin_finder

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/api/content_settings/content_settings_api.h

Issue 10910168: Separate plugin_metadata from plugin_installer, thread-safe plugin_finder (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: bauerb@ .. Created 8 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

« chrome/browser/browser_process_impl.cc ('K') | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_api.cc » ('j') | chrome/browser/plugins/plugin_finder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_api.h

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.h b/chrome/browser/extensions/api/content_settings/content_settings_api.h

index b58f66f844108b4dde54fd5fb1ca70fbb4eb574b..9270b2ae29a2ae3cd8f8ed6fa2d4b5aa19c35561 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_api.h

+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.h

@@ -65,10 +65,9 @@ class GetResourceIdentifiersFunction : public AsyncExtensionFunction {

FRIEND_TEST_ALL_PREFIXES(ExtensionApiTest,

ContentSettingsGetResourceIdentifiers);

- // Callback method that gets executed when both |finder| and |plugins|

+ // Callback method that gets executed when |plugins|

// are asynchronously fetched.

- void OnGotPlugins(const std::vector<webkit::WebPluginInfo>& plugins,

- PluginFinder* finder);

+ void OnGotPlugins(const std::vector<webkit::WebPluginInfo>& plugins);

// Used to override the global plugin list in tests.

static void SetPluginsForTesting(