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

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

Issue 11151006: Revert 161615 - Merge 161210 - Only register the newer one of {bundled, component} Pepper Flash. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/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 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 virtual void ForcePluginShutdown(const FilePath& plugin_path) OVERRIDE; 108 virtual void ForcePluginShutdown(const FilePath& plugin_path) OVERRIDE;
109 virtual bool IsPluginUnstable(const FilePath& plugin_path) OVERRIDE; 109 virtual bool IsPluginUnstable(const FilePath& plugin_path) OVERRIDE;
110 virtual void RefreshPlugins() OVERRIDE; 110 virtual void RefreshPlugins() OVERRIDE;
111 virtual void AddExtraPluginPath(const FilePath& path) OVERRIDE; 111 virtual void AddExtraPluginPath(const FilePath& path) OVERRIDE;
112 virtual void AddExtraPluginDir(const FilePath& path) OVERRIDE; 112 virtual void AddExtraPluginDir(const FilePath& path) OVERRIDE;
113 virtual void RemoveExtraPluginPath(const FilePath& path) OVERRIDE; 113 virtual void RemoveExtraPluginPath(const FilePath& path) OVERRIDE;
114 virtual void UnregisterInternalPlugin(const FilePath& path) OVERRIDE; 114 virtual void UnregisterInternalPlugin(const FilePath& path) OVERRIDE;
115 virtual void RegisterInternalPlugin( 115 virtual void RegisterInternalPlugin(
116 const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE; 116 const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE;
117 virtual string16 GetPluginGroupName(const std::string& plugin_name) OVERRIDE; 117 virtual string16 GetPluginGroupName(const std::string& plugin_name) OVERRIDE;
118 virtual void GetInternalPlugins(
119 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
120 virtual webkit::npapi::PluginList* GetPluginList() OVERRIDE; 118 virtual webkit::npapi::PluginList* GetPluginList() OVERRIDE;
121 virtual void SetPluginListForTesting( 119 virtual void SetPluginListForTesting(
122 webkit::npapi::PluginList* plugin_list) OVERRIDE; 120 webkit::npapi::PluginList* plugin_list) OVERRIDE;
123 121
124 // Returns the plugin process host corresponding to the plugin process that 122 // Returns the plugin process host corresponding to the plugin process that
125 // has been started by this service. This will start a process to host the 123 // has been started by this service. This will start a process to host the
126 // 'plugin_path' if needed. If the process fails to start, the return value 124 // 'plugin_path' if needed. If the process fails to start, the return value
127 // is NULL. Must be called on the IO thread. 125 // is NULL. Must be called on the IO thread.
128 PluginProcessHost* FindOrStartNpapiPluginProcess( 126 PluginProcessHost* FindOrStartNpapiPluginProcess(
129 const FilePath& plugin_path); 127 const FilePath& plugin_path);
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 scoped_refptr<PluginLoaderPosix> plugin_loader_; 254 scoped_refptr<PluginLoaderPosix> plugin_loader_;
257 #endif 255 #endif
258 256
259 // Used to detect if a given plug-in is crashing over and over. 257 // Used to detect if a given plug-in is crashing over and over.
260 std::map<FilePath, std::vector<base::Time> > crash_times_; 258 std::map<FilePath, std::vector<base::Time> > crash_times_;
261 259
262 DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl); 260 DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl);
263 }; 261 };
264 262
265 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_ 263 #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