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