chrome/browser/plugin_exceptions_table_model.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/plugin_exceptions_table_model.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: '' 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/extensions/extension_content_settings_api.cc ('K') | « chrome/browser/plugin_exceptions_table_model.h ('k') | chrome/browser/printing/print_preview_tab_controller.cc » ('j') | content/browser/plugin_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/plugin_exceptions_table_model.cc

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

index a2e532b24a3fcfec7f00c76ffb5ad2452f57866f..6d639264e1a660a3bd4dbe708f7502f8c1ba262a 100644

--- a/chrome/browser/plugin_exceptions_table_model.cc

+++ b/chrome/browser/plugin_exceptions_table_model.cc

@@ -8,10 +8,13 @@

#include "base/sys_string_conversions.h"

#include "base/utf_string_conversions.h"

#include "chrome/common/chrome_notification_types.h"

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

#include "content/common/notification_service.h"

#include "grit/generated_resources.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/models/table_model_observer.h"

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

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

PluginExceptionsTableModel::PluginExceptionsTableModel(

HostContentSettingsMap* content_settings_map,

@@ -139,7 +142,7 @@ void PluginExceptionsTableModel::ClearSettings() {

void PluginExceptionsTableModel::GetPlugins(

std::vector<webkit::npapi::PluginGroup>* plugin_groups) {

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

+ PluginService::GetInstance()->GetCachedPluginGroups(plugin_groups);

}

void PluginExceptionsTableModel::LoadSettings() {