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

Side by Side Diff: content/browser/plugin_process_host.cc

Issue 6992006: Terminate plugin processes on a delayed task to allow the plugins to shutdown gracefully, i.e. NP... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 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) 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 #include "content/browser/plugin_process_host.h" 5 #include "content/browser/plugin_process_host.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #elif defined(OS_POSIX) 9 #elif defined(OS_POSIX)
10 #include <utility> // for pair<> 10 #include <utility> // for pair<>
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 Launch( 215 Launch(
216 #if defined(OS_WIN) 216 #if defined(OS_WIN)
217 FilePath(), 217 FilePath(),
218 #elif defined(OS_POSIX) 218 #elif defined(OS_POSIX)
219 false, 219 false,
220 env, 220 env,
221 #endif 221 #endif
222 cmd_line); 222 cmd_line);
223 223
224 SetTerminateChildOnShutdown(false);
jam 2011/05/24 20:46:13 nit: please add a comment explaining why this is o
ananta 2011/05/24 20:56:26 Done.
225
224 content::GetContentClient()->browser()->PluginProcessHostCreated(this); 226 content::GetContentClient()->browser()->PluginProcessHostCreated(this);
225 AddFilter(new ResolveProxyMsgHelper(NULL)); 227 AddFilter(new ResolveProxyMsgHelper(NULL));
226 228
227 return true; 229 return true;
228 } 230 }
229 231
230 void PluginProcessHost::ForceShutdown() { 232 void PluginProcessHost::ForceShutdown() {
231 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 233 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
232 Send(new PluginProcessMsg_NotifyRenderersOfPendingShutdown()); 234 Send(new PluginProcessMsg_NotifyRenderersOfPendingShutdown());
233 BrowserChildProcessHost::ForceShutdown(); 235 BrowserChildProcessHost::ForceShutdown();
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 } 323 }
322 } 324 }
323 325
324 void PluginProcessHost::OnChannelCreated( 326 void PluginProcessHost::OnChannelCreated(
325 const IPC::ChannelHandle& channel_handle) { 327 const IPC::ChannelHandle& channel_handle) {
326 Client* client = sent_requests_.front(); 328 Client* client = sent_requests_.front();
327 329
328 client->OnChannelOpened(channel_handle); 330 client->OnChannelOpened(channel_handle);
329 sent_requests_.pop(); 331 sent_requests_.pop();
330 } 332 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698