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

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

Issue 8318028: Gracefully handle child process death in out-of-process plugin loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Do not send the index Created 9 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
« no previous file with comments | « content/browser/plugin_loader_posix_unittest.cc ('k') | content/browser/plugin_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_H_ 8 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_
9 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_ 9 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_
10 #pragma once 10 #pragma once
(...skipping 19 matching lines...) Expand all
30 #include "base/memory/scoped_ptr.h" 30 #include "base/memory/scoped_ptr.h"
31 #include "base/win/registry.h" 31 #include "base/win/registry.h"
32 #endif 32 #endif
33 33
34 #if defined(OS_POSIX) && !defined(OS_MACOSX) 34 #if defined(OS_POSIX) && !defined(OS_MACOSX)
35 #include "base/files/file_path_watcher.h" 35 #include "base/files/file_path_watcher.h"
36 #endif 36 #endif
37 37
38 struct PepperPluginInfo; 38 struct PepperPluginInfo;
39 class PluginDirWatcherDelegate; 39 class PluginDirWatcherDelegate;
40 class PluginLoaderPosix;
40 41
41 namespace base { 42 namespace base {
42 class MessageLoopProxy; 43 class MessageLoopProxy;
43 } 44 }
44 45
45 namespace content { 46 namespace content {
46 class BrowserContext; 47 class BrowserContext;
47 class ResourceContext; 48 class ResourceContext;
48 class PluginServiceFilter; 49 class PluginServiceFilter;
49 struct PluginServiceFilterParams; 50 struct PluginServiceFilterParams;
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 scoped_refptr<PluginDirWatcherDelegate> file_watcher_delegate_; 251 scoped_refptr<PluginDirWatcherDelegate> file_watcher_delegate_;
251 #endif 252 #endif
252 253
253 std::vector<PepperPluginInfo> ppapi_plugins_; 254 std::vector<PepperPluginInfo> ppapi_plugins_;
254 255
255 // Weak pointer; outlives us. 256 // Weak pointer; outlives us.
256 content::PluginServiceFilter* filter_; 257 content::PluginServiceFilter* filter_;
257 258
258 std::set<PluginProcessHost::Client*> pending_plugin_clients_; 259 std::set<PluginProcessHost::Client*> pending_plugin_clients_;
259 260
261 #if defined(OS_POSIX)
262 scoped_refptr<PluginLoaderPosix> plugin_loader_;
263 #endif
264
260 DISALLOW_COPY_AND_ASSIGN(PluginService); 265 DISALLOW_COPY_AND_ASSIGN(PluginService);
261 }; 266 };
262 267
263 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService); 268 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService);
264 269
265 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_H_ 270 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_H_
OLDNEW
« no previous file with comments | « content/browser/plugin_loader_posix_unittest.cc ('k') | content/browser/plugin_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698