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

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

Issue 19518006: Remove the two years old code to enable the nacl plugin once if it's disabled. This was added to de… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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 bool IsPluginUnstable(const base::FilePath& plugin_path) OVERRIDE; 101 virtual bool IsPluginUnstable(const base::FilePath& plugin_path) OVERRIDE;
102 virtual void RefreshPlugins() OVERRIDE; 102 virtual void RefreshPlugins() OVERRIDE;
103 virtual void AddExtraPluginPath(const base::FilePath& path) OVERRIDE; 103 virtual void AddExtraPluginPath(const base::FilePath& path) OVERRIDE;
104 virtual void AddExtraPluginDir(const base::FilePath& path) OVERRIDE; 104 virtual void AddExtraPluginDir(const base::FilePath& path) OVERRIDE;
105 virtual void RemoveExtraPluginPath(const base::FilePath& path) OVERRIDE; 105 virtual void RemoveExtraPluginPath(const base::FilePath& path) OVERRIDE;
106 virtual void UnregisterInternalPlugin(const base::FilePath& path) OVERRIDE; 106 virtual void UnregisterInternalPlugin(const base::FilePath& path) OVERRIDE;
107 virtual void RegisterInternalPlugin( 107 virtual void RegisterInternalPlugin(
108 const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE; 108 const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE;
109 virtual void GetInternalPlugins( 109 virtual void GetInternalPlugins(
110 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE; 110 std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
111 virtual webkit::npapi::PluginList* GetPluginList() OVERRIDE;
112 virtual void SetPluginListForTesting( 111 virtual void SetPluginListForTesting(
113 webkit::npapi::PluginList* plugin_list) OVERRIDE; 112 webkit::npapi::PluginList* plugin_list) OVERRIDE;
114 #if defined(OS_MACOSX) 113 #if defined(OS_MACOSX)
115 virtual void AppActivated() OVERRIDE; 114 virtual void AppActivated() OVERRIDE;
116 #endif 115 #endif
117 116
118 // Returns the plugin process host corresponding to the plugin process that 117 // 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 118 // 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 119 // 'plugin_path' if needed. If the process fails to start, the return value
121 // is NULL. Must be called on the IO thread. 120 // is NULL. Must be called on the IO thread.
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 240
242 // Used to detect if a given plug-in is crashing over and over. 241 // Used to detect if a given plug-in is crashing over and over.
243 std::map<base::FilePath, std::vector<base::Time> > crash_times_; 242 std::map<base::FilePath, std::vector<base::Time> > crash_times_;
244 243
245 DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl); 244 DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl);
246 }; 245 };
247 246
248 } // namespace content 247 } // namespace content
249 248
250 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_ 249 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698