| OLD | NEW |
| 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 nexe_token_(nexe_token), | 267 nexe_token_(nexe_token), |
| 268 permissions_(permissions), | 268 permissions_(permissions), |
| 269 #if defined(OS_WIN) | 269 #if defined(OS_WIN) |
| 270 process_launched_by_broker_(false), | 270 process_launched_by_broker_(false), |
| 271 #endif | 271 #endif |
| 272 reply_msg_(NULL), | 272 reply_msg_(NULL), |
| 273 #if defined(OS_WIN) | 273 #if defined(OS_WIN) |
| 274 debug_exception_handler_requested_(false), | 274 debug_exception_handler_requested_(false), |
| 275 #endif | 275 #endif |
| 276 internal_(new NaClInternal()), | 276 internal_(new NaClInternal()), |
| 277 weak_factory_(this), | |
| 278 uses_irt_(uses_irt), | 277 uses_irt_(uses_irt), |
| 279 uses_nonsfi_mode_(uses_nonsfi_mode), | 278 uses_nonsfi_mode_(uses_nonsfi_mode), |
| 280 enable_debug_stub_(false), | 279 enable_debug_stub_(false), |
| 281 enable_dyncode_syscalls_(enable_dyncode_syscalls), | 280 enable_dyncode_syscalls_(enable_dyncode_syscalls), |
| 282 enable_exception_handling_(enable_exception_handling), | 281 enable_exception_handling_(enable_exception_handling), |
| 283 enable_crash_throttling_(enable_crash_throttling), | 282 enable_crash_throttling_(enable_crash_throttling), |
| 284 off_the_record_(off_the_record), | 283 off_the_record_(off_the_record), |
| 285 profile_directory_(profile_directory), | 284 profile_directory_(profile_directory), |
| 286 render_view_id_(render_view_id) { | 285 render_view_id_(render_view_id), |
| 286 weak_factory_(this) { |
| 287 process_.reset(content::BrowserChildProcessHost::Create( | 287 process_.reset(content::BrowserChildProcessHost::Create( |
| 288 PROCESS_TYPE_NACL_LOADER, this)); | 288 PROCESS_TYPE_NACL_LOADER, this)); |
| 289 | 289 |
| 290 // Set the display name so the user knows what plugin the process is running. | 290 // Set the display name so the user knows what plugin the process is running. |
| 291 // We aren't on the UI thread so getting the pref locale for language | 291 // We aren't on the UI thread so getting the pref locale for language |
| 292 // formatting isn't possible, so IDN will be lost, but this is probably OK | 292 // formatting isn't possible, so IDN will be lost, but this is probably OK |
| 293 // for this use case. | 293 // for this use case. |
| 294 process_->SetName(net::FormatUrl(manifest_url_, std::string())); | 294 process_->SetName(net::FormatUrl(manifest_url_, std::string())); |
| 295 | 295 |
| 296 enable_debug_stub_ = CommandLine::ForCurrentProcess()->HasSwitch( | 296 enable_debug_stub_ = CommandLine::ForCurrentProcess()->HasSwitch( |
| (...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 process_handle.Take(), info, | 1168 process_handle.Take(), info, |
| 1169 base::MessageLoopProxy::current(), | 1169 base::MessageLoopProxy::current(), |
| 1170 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 1170 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
| 1171 weak_factory_.GetWeakPtr())); | 1171 weak_factory_.GetWeakPtr())); |
| 1172 return true; | 1172 return true; |
| 1173 } | 1173 } |
| 1174 } | 1174 } |
| 1175 #endif | 1175 #endif |
| 1176 | 1176 |
| 1177 } // namespace nacl | 1177 } // namespace nacl |
| OLD | NEW |