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

Side by Side Diff: chrome/browser/nacl_host/nacl_broker_host_win.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 "chrome/browser/nacl_host/nacl_broker_host_win.h" 5 #include "chrome/browser/nacl_host/nacl_broker_host_win.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "ipc/ipc_switches.h" 9 #include "ipc/ipc_switches.h"
10 #include "chrome/browser/nacl_host/nacl_broker_service_win.h" 10 #include "chrome/browser/nacl_host/nacl_broker_service_win.h"
(...skipping 29 matching lines...) Expand all
40 base::FilePath nacl_path = module_path.DirName().Append(chrome::kNaClAppName); 40 base::FilePath nacl_path = module_path.DirName().Append(chrome::kNaClAppName);
41 CommandLine* cmd_line = new CommandLine(nacl_path); 41 CommandLine* cmd_line = new CommandLine(nacl_path);
42 nacl::CopyNaClCommandLineArguments(cmd_line); 42 nacl::CopyNaClCommandLineArguments(cmd_line);
43 43
44 cmd_line->AppendSwitchASCII(switches::kProcessType, 44 cmd_line->AppendSwitchASCII(switches::kProcessType,
45 switches::kNaClBrokerProcess); 45 switches::kNaClBrokerProcess);
46 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id); 46 cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
47 if (logging::DialogsAreSuppressed()) 47 if (logging::DialogsAreSuppressed())
48 cmd_line->AppendSwitch(switches::kNoErrorDialogs); 48 cmd_line->AppendSwitch(switches::kNoErrorDialogs);
49 49
50 process_->Launch(base::FilePath(), cmd_line); 50 process_->Launch(NULL, cmd_line);
51 return true; 51 return true;
52 } 52 }
53 53
54 bool NaClBrokerHost::OnMessageReceived(const IPC::Message& msg) { 54 bool NaClBrokerHost::OnMessageReceived(const IPC::Message& msg) {
55 bool handled = true; 55 bool handled = true;
56 IPC_BEGIN_MESSAGE_MAP(NaClBrokerHost, msg) 56 IPC_BEGIN_MESSAGE_MAP(NaClBrokerHost, msg)
57 IPC_MESSAGE_HANDLER(NaClProcessMsg_LoaderLaunched, OnLoaderLaunched) 57 IPC_MESSAGE_HANDLER(NaClProcessMsg_LoaderLaunched, OnLoaderLaunched)
58 IPC_MESSAGE_HANDLER(NaClProcessMsg_DebugExceptionHandlerLaunched, 58 IPC_MESSAGE_HANDLER(NaClProcessMsg_DebugExceptionHandlerLaunched,
59 OnDebugExceptionHandlerLaunched) 59 OnDebugExceptionHandlerLaunched)
60 IPC_MESSAGE_UNHANDLED(handled = false) 60 IPC_MESSAGE_UNHANDLED(handled = false)
(...skipping 26 matching lines...) Expand all
87 87
88 void NaClBrokerHost::OnDebugExceptionHandlerLaunched(int32 pid, bool success) { 88 void NaClBrokerHost::OnDebugExceptionHandlerLaunched(int32 pid, bool success) {
89 NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid, 89 NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid,
90 success); 90 success);
91 } 91 }
92 92
93 void NaClBrokerHost::StopBroker() { 93 void NaClBrokerHost::StopBroker() {
94 is_terminating_ = true; 94 is_terminating_ = true;
95 process_->Send(new NaClProcessMsg_StopBroker()); 95 process_->Send(new NaClProcessMsg_StopBroker());
96 } 96 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/nacl_host/nacl_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698