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

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

Issue 12805004: Remove mention of the nacl process in content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 9 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/gpu/gpu_process_host.cc ('k') | content/browser/ppapi_plugin_process_host.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) 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 #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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 } 230 }
231 } 231 }
232 env.push_back(std::pair<std::string, std::string>( 232 env.push_back(std::pair<std::string, std::string>(
233 kDYLDInsertLibrariesKey, interpose_list)); 233 kDYLDInsertLibrariesKey, interpose_list));
234 } 234 }
235 #endif 235 #endif
236 #endif 236 #endif
237 237
238 process_->Launch( 238 process_->Launch(
239 #if defined(OS_WIN) 239 #if defined(OS_WIN)
240 base::FilePath(), 240 NULL,
241 #elif defined(OS_POSIX) 241 #elif defined(OS_POSIX)
242 false, 242 false,
243 env, 243 env,
244 #endif 244 #endif
245 cmd_line); 245 cmd_line);
246 246
247 // The plugin needs to be shutdown gracefully, i.e. NP_Shutdown needs to be 247 // The plugin needs to be shutdown gracefully, i.e. NP_Shutdown needs to be
248 // called on the plugin. The plugin process exits when it receives the 248 // called on the plugin. The plugin process exits when it receives the
249 // OnChannelError notification indicating that the browser plugin channel has 249 // OnChannelError notification indicating that the browser plugin channel has
250 // been destroyed. 250 // been destroyed.
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 void PluginProcessHost::OnChannelCreated( 404 void PluginProcessHost::OnChannelCreated(
405 const IPC::ChannelHandle& channel_handle) { 405 const IPC::ChannelHandle& channel_handle) {
406 Client* client = sent_requests_.front(); 406 Client* client = sent_requests_.front();
407 407
408 if (client) 408 if (client)
409 client->OnChannelOpened(channel_handle); 409 client->OnChannelOpened(channel_handle);
410 sent_requests_.pop_front(); 410 sent_requests_.pop_front();
411 } 411 }
412 412
413 } // namespace content 413 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/ppapi_plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698