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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "base/strings/string_tokenizer.h" | 10 #include "base/strings/string_tokenizer.h" |
11 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
12 #include "components/nacl/common/nacl_host_messages.h" | 12 #include "components/nacl/common/nacl_host_messages.h" |
13 #include "components/nacl/common/nacl_types.h" | 13 #include "components/nacl/common/nacl_types.h" |
14 #include "components/nacl/renderer/histogram.h" | 14 #include "components/nacl/renderer/histogram.h" |
15 #include "components/nacl/renderer/manifest_service_channel.h" | 15 #include "components/nacl/renderer/manifest_service_channel.h" |
| 16 #include "components/nacl/renderer/platform_info.h" |
16 #include "components/nacl/renderer/pnacl_translation_resource_host.h" | 17 #include "components/nacl/renderer/pnacl_translation_resource_host.h" |
17 #include "components/nacl/renderer/progress_event.h" | 18 #include "components/nacl/renderer/progress_event.h" |
18 #include "components/nacl/renderer/sandbox_arch.h" | |
19 #include "components/nacl/renderer/trusted_plugin_channel.h" | 19 #include "components/nacl/renderer/trusted_plugin_channel.h" |
20 #include "content/public/common/content_client.h" | 20 #include "content/public/common/content_client.h" |
21 #include "content/public/common/content_switches.h" | 21 #include "content/public/common/content_switches.h" |
22 #include "content/public/common/sandbox_init.h" | 22 #include "content/public/common/sandbox_init.h" |
23 #include "content/public/renderer/pepper_plugin_instance.h" | 23 #include "content/public/renderer/pepper_plugin_instance.h" |
24 #include "content/public/renderer/render_thread.h" | 24 #include "content/public/renderer/render_thread.h" |
25 #include "content/public/renderer/render_view.h" | 25 #include "content/public/renderer/render_view.h" |
26 #include "content/public/renderer/renderer_ppapi_host.h" | 26 #include "content/public/renderer/renderer_ppapi_host.h" |
27 #include "ppapi/c/pp_bool.h" | 27 #include "ppapi/c/pp_bool.h" |
28 #include "ppapi/c/private/pp_file_handle.h" | 28 #include "ppapi/c/private/pp_file_handle.h" |
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
417 // to provide error handling. | 417 // to provide error handling. |
418 } | 418 } |
419 | 419 |
420 void NexeLoadManager::CopyCrashLogToJsConsole(const std::string& crash_log) { | 420 void NexeLoadManager::CopyCrashLogToJsConsole(const std::string& crash_log) { |
421 base::StringTokenizer t(crash_log, "\n"); | 421 base::StringTokenizer t(crash_log, "\n"); |
422 while (t.GetNext()) | 422 while (t.GetNext()) |
423 LogToConsole(t.token()); | 423 LogToConsole(t.token()); |
424 } | 424 } |
425 | 425 |
426 } // namespace nacl | 426 } // namespace nacl |
OLD | NEW |