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

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

Issue 22750002: Move AlterEnvironment to base/environment.h, implement on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 7 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 #include "content/browser/ppapi_plugin_process_host.h" 5 #include "content/browser/ppapi_plugin_process_host.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base_switches.h" 9 #include "base/base_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 #if defined(OS_POSIX) 321 #if defined(OS_POSIX)
322 bool use_zygote = !is_broker_ && plugin_launcher.empty() && info.is_sandboxed; 322 bool use_zygote = !is_broker_ && plugin_launcher.empty() && info.is_sandboxed;
323 if (!info.is_sandboxed) 323 if (!info.is_sandboxed)
324 cmd_line->AppendSwitchASCII(switches::kNoSandbox, std::string()); 324 cmd_line->AppendSwitchASCII(switches::kNoSandbox, std::string());
325 #endif // OS_POSIX 325 #endif // OS_POSIX
326 process_->Launch( 326 process_->Launch(
327 #if defined(OS_WIN) 327 #if defined(OS_WIN)
328 new PpapiPluginSandboxedProcessLauncherDelegate(is_broker_), 328 new PpapiPluginSandboxedProcessLauncherDelegate(is_broker_),
329 #elif defined(OS_POSIX) 329 #elif defined(OS_POSIX)
330 use_zygote, 330 use_zygote,
331 base::EnvironmentVector(), 331 base::EnvironmentMap(),
332 #endif 332 #endif
333 cmd_line); 333 cmd_line);
334 return true; 334 return true;
335 } 335 }
336 336
337 void PpapiPluginProcessHost::RequestPluginChannel(Client* client) { 337 void PpapiPluginProcessHost::RequestPluginChannel(Client* client) {
338 base::ProcessHandle process_handle; 338 base::ProcessHandle process_handle;
339 int renderer_child_id; 339 int renderer_child_id;
340 client->GetPpapiChannelInfo(&process_handle, &renderer_child_id); 340 client->GetPpapiChannelInfo(&process_handle, &renderer_child_id);
341 341
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 // sent_requests_ queue should be the one that the plugin just created. 424 // sent_requests_ queue should be the one that the plugin just created.
425 Client* client = sent_requests_.front(); 425 Client* client = sent_requests_.front();
426 sent_requests_.pop(); 426 sent_requests_.pop();
427 427
428 const ChildProcessData& data = process_->GetData(); 428 const ChildProcessData& data = process_->GetData();
429 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle), 429 client->OnPpapiChannelOpened(channel_handle, base::GetProcId(data.handle),
430 data.id); 430 data.id);
431 } 431 }
432 432
433 } // namespace content 433 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/plugin_process_host.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698