content/browser/plugin_service_impl.h - Issue 11090018: Only register the newer one of {bundled, component} Pepper Flash.

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: content/browser/plugin_service_impl.h

Issue 11090018: Only register the newer one of {bundled, component} Pepper Flash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review Created 8 years, 2 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:

Index: content/browser/plugin_service_impl.h

diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h

index f5e0d1619e3aa840653bd1478a73d265534050a4..a185fec18e2e40190ac762c724a0fca4a6d8b562 100644

--- a/content/browser/plugin_service_impl.h

+++ b/content/browser/plugin_service_impl.h

@@ -108,6 +108,8 @@ class CONTENT_EXPORT PluginServiceImpl

virtual void UnregisterInternalPlugin(const FilePath& path) OVERRIDE;

virtual void RegisterInternalPlugin(

const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE;

+ virtual void GetInternalPlugins(

+ std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;

virtual webkit::npapi::PluginList* GetPluginList() OVERRIDE;

virtual void SetPluginListForTesting(

webkit::npapi::PluginList* plugin_list) OVERRIDE;