Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(792)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/plugin_service_impl.h

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') | « chrome/browser/component_updater/pepper_flash_component_installer.cc ('k') | content/browser/plugin_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/plugin_service_impl.h
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h
index 0875ecca88c2933800fd63e5a8a959bf352608c5..756f6f4fcb0e6ff7ba159934f733f5e196e5c84b 100644
--- a/content/browser/plugin_service_impl.h
+++ b/content/browser/plugin_service_impl.h
@@ -115,6 +115,8 @@ class CONTENT_EXPORT PluginServiceImpl
virtual void RegisterInternalPlugin(
const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE;
virtual string16 GetPluginGroupName(const std::string& plugin_name) OVERRIDE;
+ virtual void GetInternalPlugins(
+ std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
virtual webkit::npapi::PluginList* GetPluginList() OVERRIDE;
virtual void SetPluginListForTesting(
webkit::npapi::PluginList* plugin_list) OVERRIDE;
« chrome/browser/component_updater/pepper_flash_component_installer.cc ('K') | « chrome/browser/component_updater/pepper_flash_component_installer.cc ('k') | content/browser/plugin_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698