chrome/browser/plugins/plugin_prefs.cc - Issue 10918174: Remove PluginGroup

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

Issue 10918174: Remove PluginGroup (Closed) Base URL: http://git.chromium.org/chromium/src.git@remove_async_plugin_finder

Patch Set: fix conflicts 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:

Index: chrome/browser/plugins/plugin_prefs.cc

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

index 8bb423041243a1b95a929ebe3b17c5870c22d548..986b315640d5ee4321c91226852c2c0bdb13e980 100644

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

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

@@ -32,7 +32,6 @@

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/plugin_service.h"

-#include "webkit/plugins/npapi/plugin_group.h"

#include "webkit/plugins/npapi/plugin_list.h"

#include "webkit/plugins/npapi/plugin_utils.h"

#include "webkit/plugins/webplugininfo.h"

@@ -616,7 +615,7 @@ void PluginPrefs::SetPrefs(PrefService* prefs) {

if (force_enable_internal_pdf || internal_pdf_enabled) {

// See http://crbug.com/50105 for background.

plugin_group_state_[ASCIIToUTF16(

- webkit::npapi::PluginGroup::kAdobeReaderGroupName)] = false;

+ PluginMetadata::kAdobeReaderGroupName)] = false;

}

if (force_enable_internal_pdf || force_enable_nacl) {