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

Side by Side Diff: content/browser/plugin_service_impl.h

Issue 11090018: Only register the newer one of {bundled, component} Pepper Flash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This class responds to requests from renderers for the list of plugins, and 5 // This class responds to requests from renderers for the list of plugins, and
6 // also a proxy object for plugin instances. 6 // also a proxy object for plugin instances.
7 7
8 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_ 8 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
9 #define CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_ 9 #define CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
10 10
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 virtual content::PluginServiceFilter* GetFilter() OVERRIDE; 101 virtual content::PluginServiceFilter* GetFilter() OVERRIDE;
102 virtual void ForcePluginShutdown(const FilePath& plugin_path) OVERRIDE; 102 virtual void ForcePluginShutdown(const FilePath& plugin_path) OVERRIDE;
103 virtual bool IsPluginUnstable(const FilePath& plugin_path) OVERRIDE; 103 virtual bool IsPluginUnstable(const FilePath& plugin_path) OVERRIDE;
104 virtual void RefreshPlugins() OVERRIDE; 104 virtual void RefreshPlugins() OVERRIDE;
105 virtual void AddExtraPluginPath(const FilePath& path) OVERRIDE; 105 virtual void AddExtraPluginPath(const FilePath& path) OVERRIDE;
106 virtual void AddExtraPluginDir(const FilePath& path) OVERRIDE; 106 virtual void AddExtraPluginDir(const FilePath& path) OVERRIDE;
107 virtual void RemoveExtraPluginPath(const FilePath& path) OVERRIDE; 107 virtual void RemoveExtraPluginPath(const FilePath& path) OVERRIDE;
108 virtual void UnregisterInternalPlugin(const FilePath& path) OVERRIDE; 108 virtual void UnregisterInternalPlugin(const FilePath& path) OVERRIDE;
109 virtual void RegisterInternalPlugin( 109 virtual void RegisterInternalPlugin(
110 const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE; 110 const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE;
111 virtual void GetInternalPlugins(
112 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
111 virtual webkit::npapi::PluginList* GetPluginList() OVERRIDE; 113 virtual webkit::npapi::PluginList* GetPluginList() OVERRIDE;
112 virtual void SetPluginListForTesting( 114 virtual void SetPluginListForTesting(
113 webkit::npapi::PluginList* plugin_list) OVERRIDE; 115 webkit::npapi::PluginList* plugin_list) OVERRIDE;
114 #if defined(OS_MACOSX) 116 #if defined(OS_MACOSX)
115 virtual void AppActivated() OVERRIDE; 117 virtual void AppActivated() OVERRIDE;
116 #endif 118 #endif
117 119
118 // Returns the plugin process host corresponding to the plugin process that 120 // Returns the plugin process host corresponding to the plugin process that
119 // has been started by this service. This will start a process to host the 121 // has been started by this service. This will start a process to host the
120 // 'plugin_path' if needed. If the process fails to start, the return value 122 // 'plugin_path' if needed. If the process fails to start, the return value
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 scoped_refptr<PluginLoaderPosix> plugin_loader_; 245 scoped_refptr<PluginLoaderPosix> plugin_loader_;
244 #endif 246 #endif
245 247
246 // Used to detect if a given plug-in is crashing over and over. 248 // Used to detect if a given plug-in is crashing over and over.
247 std::map<FilePath, std::vector<base::Time> > crash_times_; 249 std::map<FilePath, std::vector<base::Time> > crash_times_;
248 250
249 DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl); 251 DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl);
250 }; 252 };
251 253
252 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_ 254 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
OLDNEW
« no previous file with comments | « 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