chrome/browser/pdf_unsupported_feature.cc - Issue 7980011: Convert the PluginService interface to be an async wrapper around 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: chrome/browser/pdf_unsupported_feature.cc

Issue 7980011: Convert the PluginService interface to be an async wrapper around PluginList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: New interface as discussed Created 9 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/metrics/metrics_service.cc ('K') | « chrome/browser/mock_plugin_exceptions_table_model.cc ('k') | chrome/browser/plugin_exceptions_table_model.h » ('j') | chrome/browser/ui/webui/plugins_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/pdf_unsupported_feature.cc

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

index c5460f810dd4523426eaf3e4b12fc9531aa736f1..3c945bbe61433a0055bcb8e8ecee3d851765e0b5 100644

--- a/chrome/browser/pdf_unsupported_feature.cc

+++ b/chrome/browser/pdf_unsupported_feature.cc

@@ -30,11 +30,8 @@

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/image/image.h"

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

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

-#include "webkit/plugins/webplugininfo.h"

using webkit::npapi::PluginGroup;

-using webkit::npapi::PluginList;

using webkit::WebPluginInfo;

namespace {

@@ -387,7 +384,7 @@ void PDFHasUnsupportedFeature(TabContentsWrapper* tab) {

PluginGroup* reader_group = NULL;

std::vector<PluginGroup> plugin_groups;

- PluginList::Singleton()->GetPluginGroups(false, &plugin_groups);

+ PluginService::GetInstance()->GetPluginGroups(&plugin_groups);

for (size_t i = 0; i < plugin_groups.size(); ++i) {

if (plugin_groups[i].GetGroupName() == reader_group_name) {

reader_group = &plugin_groups[i];