chrome/browser/plugin_prefs.cc - Issue 8493026: Revert r108760 / reland r108744, r108753 w/ fix

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/plugin_prefs.cc

Issue 8493026: Revert r108760 / reland r108744, r108753 w/ fix (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rename plugin list accessor to plugin_list() 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: chrome/browser/plugin_prefs.cc

diff --git a/chrome/browser/plugin_prefs.cc b/chrome/browser/plugin_prefs.cc

index c20886e9b30be3f00a3bde42afd3f7783337845b..94ecb6e232cccfeedaa2eba4003474dd8ca32028 100644

--- a/chrome/browser/plugin_prefs.cc

+++ b/chrome/browser/plugin_prefs.cc

@@ -480,7 +480,7 @@ void PluginPrefs::SetPolicyEnforcedPluginPatterns(

webkit::npapi::PluginList* PluginPrefs::GetPluginList() {

if (plugin_list_)

return plugin_list_;

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

+ return PluginService::GetInstance()->plugin_list();

}

void PluginPrefs::GetPreferencesDataOnFileThread() {