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

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

Issue 10977003: Merge 158364 - Handle crashing Pepper plug-ins the same as crashing NPAPI plug-ins. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1229/src/
Patch Set: Created 8 years, 3 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 #ifndef CONTENT_BROWSER_PPAPI_PLUGIN_PROCESS_HOST_H_ 5 #ifndef CONTENT_BROWSER_PPAPI_PLUGIN_PROCESS_HOST_H_
6 #define CONTENT_BROWSER_PPAPI_PLUGIN_PROCESS_HOST_H_ 6 #define CONTENT_BROWSER_PPAPI_PLUGIN_PROCESS_HOST_H_
7 7
8 #include <string> 8 #include <string>
9 #include <queue> 9 #include <queue>
10 10
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 PpapiPluginProcessHost(); 104 PpapiPluginProcessHost();
105 105
106 // Actually launches the process with the given plugin info. Returns true 106 // Actually launches the process with the given plugin info. Returns true
107 // on success (the process was spawned). 107 // on success (the process was spawned).
108 bool Init(const content::PepperPluginInfo& info); 108 bool Init(const content::PepperPluginInfo& info);
109 109
110 void RequestPluginChannel(Client* client); 110 void RequestPluginChannel(Client* client);
111 111
112 virtual void OnProcessLaunched() OVERRIDE; 112 virtual void OnProcessLaunched() OVERRIDE;
113 113
114 virtual void OnProcessCrashed(int exit_code) OVERRIDE;
114 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; 115 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
115 virtual void OnChannelConnected(int32 peer_pid) OVERRIDE; 116 virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
116 virtual void OnChannelError() OVERRIDE; 117 virtual void OnChannelError() OVERRIDE;
117 118
118 void CancelRequests(); 119 void CancelRequests();
119 120
120 // IPC message handlers. 121 // IPC message handlers.
121 void OnRendererPluginChannelCreated(const IPC::ChannelHandle& handle); 122 void OnRendererPluginChannelCreated(const IPC::ChannelHandle& handle);
122 123
123 // Handles most requests from the plugin. May be NULL. 124 // Handles most requests from the plugin. May be NULL.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 : public content::BrowserChildProcessHostTypeIterator< 164 : public content::BrowserChildProcessHostTypeIterator<
164 PpapiPluginProcessHost> { 165 PpapiPluginProcessHost> {
165 public: 166 public:
166 PpapiBrokerProcessHostIterator() 167 PpapiBrokerProcessHostIterator()
167 : content::BrowserChildProcessHostTypeIterator< 168 : content::BrowserChildProcessHostTypeIterator<
168 PpapiPluginProcessHost>(content::PROCESS_TYPE_PPAPI_BROKER) {} 169 PpapiPluginProcessHost>(content::PROCESS_TYPE_PPAPI_BROKER) {}
169 }; 170 };
170 171
171 #endif // CONTENT_BROWSER_PPAPI_PLUGIN_PROCESS_HOST_H_ 172 #endif // CONTENT_BROWSER_PPAPI_PLUGIN_PROCESS_HOST_H_
172 173
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/plugin_info_message_filter.cc ('k') | content/browser/ppapi_plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698