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

Side by Side Diff: components/nacl/browser/nacl_process_host.cc

Issue 2365273004: Initial implementation for sharing field trial state (win) (Closed)
Patch Set: Remove windows macro causing compilation issue Created 4 years, 2 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
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 "components/nacl/browser/nacl_process_host.h" 5 #include "components/nacl/browser/nacl_process_host.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 if (!NaClBrokerService::GetInstance()->LaunchLoader( 662 if (!NaClBrokerService::GetInstance()->LaunchLoader(
663 weak_factory_.GetWeakPtr(), mojo_channel_token)) { 663 weak_factory_.GetWeakPtr(), mojo_channel_token)) {
664 SendErrorToRenderer("broker service did not launch process"); 664 SendErrorToRenderer("broker service did not launch process");
665 return false; 665 return false;
666 } 666 }
667 return true; 667 return true;
668 } 668 }
669 #endif 669 #endif
670 process_->Launch( 670 process_->Launch(
671 new NaClSandboxedProcessLauncherDelegate(process_->GetHost()), 671 new NaClSandboxedProcessLauncherDelegate(process_->GetHost()),
672 NULL,
672 cmd_line.release(), 673 cmd_line.release(),
673 true); 674 true);
674 return true; 675 return true;
675 } 676 }
676 677
677 bool NaClProcessHost::OnMessageReceived(const IPC::Message& msg) { 678 bool NaClProcessHost::OnMessageReceived(const IPC::Message& msg) {
678 if (uses_nonsfi_mode_) { 679 if (uses_nonsfi_mode_) {
679 // IPC messages relating to NaCl's validation cache must not be exposed 680 // IPC messages relating to NaCl's validation cache must not be exposed
680 // in Non-SFI Mode, otherwise a Non-SFI nexe could use SetKnownToValidate 681 // in Non-SFI Mode, otherwise a Non-SFI nexe could use SetKnownToValidate
681 // to create a hole in the SFI sandbox. 682 // to create a hole in the SFI sandbox.
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 NaClStartDebugExceptionHandlerThread( 1300 NaClStartDebugExceptionHandlerThread(
1300 std::move(process), info, base::ThreadTaskRunnerHandle::Get(), 1301 std::move(process), info, base::ThreadTaskRunnerHandle::Get(),
1301 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, 1302 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
1302 weak_factory_.GetWeakPtr())); 1303 weak_factory_.GetWeakPtr()));
1303 return true; 1304 return true;
1304 } 1305 }
1305 } 1306 }
1306 #endif 1307 #endif
1307 1308
1308 } // namespace nacl 1309 } // namespace nacl
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698