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

Unified Diff: chrome/nacl/broker_thread.cc

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: simplify chrome_exe.gypi Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/nacl/broker_thread.h ('k') | chrome/nacl/nacl_broker_listener.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/nacl/broker_thread.cc
===================================================================
--- chrome/nacl/broker_thread.cc (revision 100721)
+++ chrome/nacl/broker_thread.cc (working copy)
@@ -1,82 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/nacl/broker_thread.h"
-
-#include "base/base_switches.h"
-#include "base/command_line.h"
-#include "base/path_service.h"
-#include "base/process_util.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/nacl_cmd_line.h"
-#include "chrome/common/nacl_messages.h"
-#include "content/common/child_process.h"
-#include "content/common/sandbox_policy.h"
-#include "ipc/ipc_switches.h"
-
-NaClBrokerThread::NaClBrokerThread()
- : browser_handle_(0),
- broker_services_(NULL) {
-}
-
-NaClBrokerThread::~NaClBrokerThread() {
- base::CloseProcessHandle(browser_handle_);
-}
-
-NaClBrokerThread* NaClBrokerThread::current() {
- return static_cast<NaClBrokerThread*>(ChildThread::current());
-}
-
-bool NaClBrokerThread::OnControlMessageReceived(const IPC::Message& msg) {
- bool handled = true;
- IPC_BEGIN_MESSAGE_MAP(NaClBrokerThread, msg)
- IPC_MESSAGE_HANDLER(NaClProcessMsg_LaunchLoaderThroughBroker,
- OnLaunchLoaderThroughBroker)
- IPC_MESSAGE_HANDLER(NaClProcessMsg_StopBroker, OnStopBroker)
- IPC_MESSAGE_UNHANDLED(handled = false)
- IPC_END_MESSAGE_MAP()
- return handled;
-}
-
-void NaClBrokerThread::OnLaunchLoaderThroughBroker(
- const std::wstring& loader_channel_id) {
- base::ProcessHandle loader_process = 0;
- base::ProcessHandle loader_handle_in_browser = 0;
-
- // Create the path to the nacl broker/loader executable - it's the executable
- // this code is running in.
- FilePath exe_path;
- PathService::Get(base::FILE_EXE, &exe_path);
- if (!exe_path.empty()) {
- CommandLine* cmd_line = new CommandLine(exe_path);
- nacl::CopyNaClCommandLineArguments(cmd_line);
-
- cmd_line->AppendSwitchASCII(switches::kProcessType,
- switches::kNaClLoaderProcess);
-
- // TODO(evanm): remove needless usage of wstring for channel id.
- cmd_line->AppendSwitchASCII(switches::kProcessChannelID,
- WideToASCII(loader_channel_id));
-
- loader_process = sandbox::StartProcessWithAccess(cmd_line, FilePath());
- if (loader_process) {
- DuplicateHandle(::GetCurrentProcess(), loader_process,
- browser_handle_, &loader_handle_in_browser,
- PROCESS_DUP_HANDLE | PROCESS_QUERY_INFORMATION , FALSE, 0);
- }
- }
- Send(new NaClProcessMsg_LoaderLaunched(loader_channel_id,
- loader_handle_in_browser));
-}
-
-void NaClBrokerThread::OnStopBroker() {
- ChildProcess::current()->ReleaseProcess();
-}
-
-void NaClBrokerThread::OnChannelConnected(int32 peer_pid) {
- bool res = base::OpenProcessHandle(peer_pid, &browser_handle_);
- DCHECK(res);
- ChildProcess::current()->AddRefProcess();
-}
-
« no previous file with comments | « chrome/nacl/broker_thread.h ('k') | chrome/nacl/nacl_broker_listener.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698