content/browser/plugin_service_impl.cc - Issue 11141011: Merge 161210 - Only register the newer one of {bundled, component} Pepper Flash.

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_impl.cc

Issue 11141011: Merge 161210 - Only register the newer one of {bundled, component} Pepper Flash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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/component_updater/pepper_flash_component_installer.cc ('K') | « content/browser/plugin_service_impl.h ('k') | content/public/browser/plugin_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/plugin_service_impl.cc

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

index 5a35037a1d6a4aaa24d708a56db9e5dd63474e7a..cbe320702ecbcaf80a07dbbc4fd3ab8fb09ffbe5 100644

--- a/content/browser/plugin_service_impl.cc

+++ b/content/browser/plugin_service_impl.cc

@@ -736,6 +736,11 @@ string16 PluginServiceImpl::GetPluginGroupName(const std::string& plugin_name) {

return plugin_list_->GetPluginGroupName(plugin_name);

}

+void PluginServiceImpl::GetInternalPlugins(

+ std::vector<webkit::WebPluginInfo>* plugins) {

+ plugin_list_->GetInternalPlugins(plugins);

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

return plugin_list_;

}