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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 #endif | 261 #endif |
262 uses_nonsfi_mode_(uses_nonsfi_mode), | 262 uses_nonsfi_mode_(uses_nonsfi_mode), |
263 enable_debug_stub_(false), | 263 enable_debug_stub_(false), |
264 enable_crash_throttling_(false), | 264 enable_crash_throttling_(false), |
265 off_the_record_(off_the_record), | 265 off_the_record_(off_the_record), |
266 process_type_(process_type), | 266 process_type_(process_type), |
267 profile_directory_(profile_directory), | 267 profile_directory_(profile_directory), |
268 render_view_id_(render_view_id), | 268 render_view_id_(render_view_id), |
269 weak_factory_(this) { | 269 weak_factory_(this) { |
270 process_.reset(content::BrowserChildProcessHost::Create( | 270 process_.reset(content::BrowserChildProcessHost::Create( |
271 PROCESS_TYPE_NACL_LOADER, this)); | 271 static_cast<content::ProcessType>(PROCESS_TYPE_NACL_LOADER), this)); |
272 | 272 |
273 // Set the display name so the user knows what plugin the process is running. | 273 // Set the display name so the user knows what plugin the process is running. |
274 // We aren't on the UI thread so getting the pref locale for language | 274 // We aren't on the UI thread so getting the pref locale for language |
275 // formatting isn't possible, so IDN will be lost, but this is probably OK | 275 // formatting isn't possible, so IDN will be lost, but this is probably OK |
276 // for this use case. | 276 // for this use case. |
277 process_->SetName(net::FormatUrl(manifest_url_, std::string())); | 277 process_->SetName(net::FormatUrl(manifest_url_, std::string())); |
278 | 278 |
279 enable_debug_stub_ = base::CommandLine::ForCurrentProcess()->HasSwitch( | 279 enable_debug_stub_ = base::CommandLine::ForCurrentProcess()->HasSwitch( |
280 switches::kEnableNaClDebug); | 280 switches::kEnableNaClDebug); |
281 DCHECK(process_type_ != kUnknownNaClProcessType); | 281 DCHECK(process_type_ != kUnknownNaClProcessType); |
(...skipping 926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1208 process.Pass(), info, | 1208 process.Pass(), info, |
1209 base::MessageLoopProxy::current(), | 1209 base::MessageLoopProxy::current(), |
1210 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 1210 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
1211 weak_factory_.GetWeakPtr())); | 1211 weak_factory_.GetWeakPtr())); |
1212 return true; | 1212 return true; |
1213 } | 1213 } |
1214 } | 1214 } |
1215 #endif | 1215 #endif |
1216 | 1216 |
1217 } // namespace nacl | 1217 } // namespace nacl |
OLD | NEW |