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

Side by Side Diff: chrome/browser/nacl_host/nacl_broker_host_win.cc

Issue 16867015: Revert r207951 - "Separate NaCl switches to their own file." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/nacl_host/nacl_process_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "chrome/browser/nacl_host/nacl_browser.h" 11 #include "chrome/browser/nacl_host/nacl_browser.h"
12 #include "chrome/common/chrome_process_type.h" 12 #include "chrome/common/chrome_process_type.h"
13 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
14 #include "chrome/common/logging_chrome.h" 14 #include "chrome/common/logging_chrome.h"
15 #include "chrome/common/nacl_cmd_line.h" 15 #include "chrome/common/nacl_cmd_line.h"
16 #include "chrome/common/nacl_messages.h" 16 #include "chrome/common/nacl_messages.h"
17 #include "components/nacl/common/nacl_switches.h"
18 #include "content/public/browser/browser_child_process_host.h" 17 #include "content/public/browser/browser_child_process_host.h"
19 #include "content/public/browser/child_process_data.h" 18 #include "content/public/browser/child_process_data.h"
20 #include "content/public/common/child_process_host.h" 19 #include "content/public/common/child_process_host.h"
21 #include "content/public/common/sandboxed_process_launcher_delegate.h" 20 #include "content/public/common/sandboxed_process_launcher_delegate.h"
22 21
23 namespace { 22 namespace {
24 // NOTE: changes to this class need to be reviewed by the security team. 23 // NOTE: changes to this class need to be reviewed by the security team.
25 class NaClBrokerSandboxedProcessLauncherDelegate 24 class NaClBrokerSandboxedProcessLauncherDelegate
26 : public content::SandboxedProcessLauncherDelegate { 25 : public content::SandboxedProcessLauncherDelegate {
27 public: 26 public:
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 104
106 void NaClBrokerHost::OnDebugExceptionHandlerLaunched(int32 pid, bool success) { 105 void NaClBrokerHost::OnDebugExceptionHandlerLaunched(int32 pid, bool success) {
107 NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid, 106 NaClBrokerService::GetInstance()->OnDebugExceptionHandlerLaunched(pid,
108 success); 107 success);
109 } 108 }
110 109
111 void NaClBrokerHost::StopBroker() { 110 void NaClBrokerHost::StopBroker() {
112 is_terminating_ = true; 111 is_terminating_ = true;
113 process_->Send(new NaClProcessMsg_StopBroker()); 112 process_->Send(new NaClProcessMsg_StopBroker());
114 } 113 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.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