OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/renderer/nexe_load_manager.h" | 5 #include "components/nacl/renderer/nexe_load_manager.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
404 } | 404 } |
405 | 405 |
406 if (manifest_url.empty()) { | 406 if (manifest_url.empty()) { |
407 VLOG(1) << "WARNING: no 'src' property, so no manifest loaded."; | 407 VLOG(1) << "WARNING: no 'src' property, so no manifest loaded."; |
408 if (args_.find(kNaClManifestAttribute) != args_.end()) | 408 if (args_.find(kNaClManifestAttribute) != args_.end()) |
409 VLOG(1) << "WARNING: 'nacl' property is incorrect. Use 'src'."; | 409 VLOG(1) << "WARNING: 'nacl' property is incorrect. Use 'src'."; |
410 } | 410 } |
411 return manifest_url; | 411 return manifest_url; |
412 } | 412 } |
413 | 413 |
| 414 void NexeLoadManager::CloseTrustedPluginChannel() { |
| 415 trusted_plugin_channel_.reset(); |
| 416 } |
| 417 |
414 bool NexeLoadManager::IsPNaCl() const { | 418 bool NexeLoadManager::IsPNaCl() const { |
415 return mime_type_ == kPNaClMIMEType; | 419 return mime_type_ == kPNaClMIMEType; |
416 } | 420 } |
417 | 421 |
418 bool NexeLoadManager::DevInterfacesEnabled() const { | 422 bool NexeLoadManager::DevInterfacesEnabled() const { |
419 // Look for the developer attribute; if it's present, enable 'dev' | 423 // Look for the developer attribute; if it's present, enable 'dev' |
420 // interfaces. | 424 // interfaces. |
421 return args_.find(kDevAttribute) != args_.end(); | 425 return args_.find(kDevAttribute) != args_.end(); |
422 } | 426 } |
423 | 427 |
(...skipping 16 matching lines...) Expand all Loading... |
440 // to provide error handling. | 444 // to provide error handling. |
441 } | 445 } |
442 | 446 |
443 void NexeLoadManager::CopyCrashLogToJsConsole(const std::string& crash_log) { | 447 void NexeLoadManager::CopyCrashLogToJsConsole(const std::string& crash_log) { |
444 base::StringTokenizer t(crash_log, "\n"); | 448 base::StringTokenizer t(crash_log, "\n"); |
445 while (t.GetNext()) | 449 while (t.GetNext()) |
446 LogToConsole(t.token()); | 450 LogToConsole(t.token()); |
447 } | 451 } |
448 | 452 |
449 } // namespace nacl | 453 } // namespace nacl |
OLD | NEW |