content/browser/plugin_service.cc - Issue 8515021: Move PluginPrefs to use PluginService instead of 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: content/browser/plugin_service.cc

Issue 8515021: Move PluginPrefs to use PluginService instead of PluginList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 1 month 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.cc

diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc

index b0cbb7f8541d197993ecd71711b38af3b7b4d640..42ba86872fa12dbf47943697c687c03f731c7d94 100644

--- a/content/browser/plugin_service.cc

+++ b/content/browser/plugin_service.cc

@@ -644,6 +644,8 @@ void PluginService::UnregisterInternalPlugin(const FilePath& path) {

}

webkit::npapi::PluginList* PluginService::plugin_list() {

+ if (plugin_list_)

+ return plugin_list_;

return webkit::npapi::PluginList::Singleton();

}