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

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
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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 } 231 }
232 } 232 }
233 env.push_back(std::pair<std::string, std::string>( 233 env.push_back(std::pair<std::string, std::string>(
234 kDYLDInsertLibrariesKey, interpose_list)); 234 kDYLDInsertLibrariesKey, interpose_list));
235 } 235 }
236 #endif 236 #endif
237 #endif 237 #endif
238 238
239 process_->Launch( 239 process_->Launch(
240 #if defined(OS_WIN) 240 #if defined(OS_WIN)
241 base::FilePath(), 241 NULL,
242 #elif defined(OS_POSIX) 242 #elif defined(OS_POSIX)
243 false, 243 false,
244 env, 244 env,
245 #endif 245 #endif
246 cmd_line); 246 cmd_line);
247 247
248 // The plugin needs to be shutdown gracefully, i.e. NP_Shutdown needs to be 248 // The plugin needs to be shutdown gracefully, i.e. NP_Shutdown needs to be
249 // called on the plugin. The plugin process exits when it receives the 249 // called on the plugin. The plugin process exits when it receives the
250 // OnChannelError notification indicating that the browser plugin channel has 250 // OnChannelError notification indicating that the browser plugin channel has
251 // been destroyed. 251 // been destroyed.
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 void PluginProcessHost::OnChannelCreated( 405 void PluginProcessHost::OnChannelCreated(
406 const IPC::ChannelHandle& channel_handle) { 406 const IPC::ChannelHandle& channel_handle) {
407 Client* client = sent_requests_.front(); 407 Client* client = sent_requests_.front();
408 408
409 if (client) 409 if (client)
410 client->OnChannelOpened(channel_handle); 410 client->OnChannelOpened(channel_handle);
411 sent_requests_.pop_front(); 411 sent_requests_.pop_front();
412 } 412 }
413 413
414 } // namespace content 414 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698