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

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

Issue 1315163004: Remove the unused helper apps on OS X. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore comment per review. Created 5 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
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 <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 } 588 }
589 589
590 bool NaClProcessHost::LaunchSelLdr() { 590 bool NaClProcessHost::LaunchSelLdr() {
591 std::string channel_id = process_->GetHost()->CreateChannel(); 591 std::string channel_id = process_->GetHost()->CreateChannel();
592 if (channel_id.empty()) { 592 if (channel_id.empty()) {
593 SendErrorToRenderer("CreateChannel() failed"); 593 SendErrorToRenderer("CreateChannel() failed");
594 return false; 594 return false;
595 } 595 }
596 596
597 // Build command line for nacl. 597 // Build command line for nacl.
598
599 #if defined(OS_LINUX) 598 #if defined(OS_LINUX)
600 int flags = ChildProcessHost::CHILD_ALLOW_SELF; 599 int flags = ChildProcessHost::CHILD_ALLOW_SELF;
601 #else 600 #else
602 int flags = ChildProcessHost::CHILD_NORMAL; 601 int flags = ChildProcessHost::CHILD_NORMAL;
603 #endif 602 #endif
604 603
605 base::FilePath exe_path = ChildProcessHost::GetChildPath(flags); 604 base::FilePath exe_path = ChildProcessHost::GetChildPath(flags);
606 if (exe_path.empty()) 605 if (exe_path.empty())
607 return false; 606 return false;
608 607
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 NaClStartDebugExceptionHandlerThread( 1376 NaClStartDebugExceptionHandlerThread(
1378 process.Pass(), info, base::ThreadTaskRunnerHandle::Get(), 1377 process.Pass(), info, base::ThreadTaskRunnerHandle::Get(),
1379 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, 1378 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
1380 weak_factory_.GetWeakPtr())); 1379 weak_factory_.GetWeakPtr()));
1381 return true; 1380 return true;
1382 } 1381 }
1383 } 1382 }
1384 #endif 1383 #endif
1385 1384
1386 } // namespace nacl 1385 } // namespace nacl
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698