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 "content/ppapi_plugin/ppapi_thread.h" | 5 #include "content/ppapi_plugin/ppapi_thread.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/crash_logging.h" | 10 #include "base/debug/crash_logging.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
13 #include "base/rand_util.h" | 13 #include "base/rand_util.h" |
14 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
16 #include "base/threading/platform_thread.h" | 16 #include "base/threading/platform_thread.h" |
17 #include "base/time/time.h" | 17 #include "base/time/time.h" |
18 #include "content/child/browser_font_resource_trusted.h" | 18 #include "content/child/browser_font_resource_trusted.h" |
19 #include "content/child/child_process.h" | 19 #include "content/child/child_process.h" |
20 #include "content/common/child_process_messages.h" | 20 #include "content/common/child_process_messages.h" |
21 #include "content/common/sandbox_util.h" | 21 #include "content/common/sandbox_util.h" |
22 #include "content/ppapi_plugin/broker_process_dispatcher.h" | 22 #include "content/ppapi_plugin/broker_process_dispatcher.h" |
23 #include "content/ppapi_plugin/plugin_process_dispatcher.h" | 23 #include "content/ppapi_plugin/plugin_process_dispatcher.h" |
24 #include "content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h" | 24 #include "content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h" |
25 #include "content/public/common/content_client.h" | 25 #include "content/public/common/content_client.h" |
| 26 #include "content/public/common/content_switches.h" |
26 #include "content/public/common/pepper_plugin_info.h" | 27 #include "content/public/common/pepper_plugin_info.h" |
27 #include "content/public/common/sandbox_init.h" | 28 #include "content/public/common/sandbox_init.h" |
28 #include "content/public/plugin/content_plugin_client.h" | 29 #include "content/public/plugin/content_plugin_client.h" |
29 #include "ipc/ipc_channel_handle.h" | 30 #include "ipc/ipc_channel_handle.h" |
30 #include "ipc/ipc_platform_file.h" | 31 #include "ipc/ipc_platform_file.h" |
31 #include "ipc/ipc_sync_channel.h" | 32 #include "ipc/ipc_sync_channel.h" |
32 #include "ipc/ipc_sync_message_filter.h" | 33 #include "ipc/ipc_sync_message_filter.h" |
33 #include "ppapi/c/dev/ppp_network_state_dev.h" | 34 #include "ppapi/c/dev/ppp_network_state_dev.h" |
34 #include "ppapi/c/pp_errors.h" | 35 #include "ppapi/c/pp_errors.h" |
35 #include "ppapi/c/ppp.h" | 36 #include "ppapi/c/ppp.h" |
36 #include "ppapi/proxy/interface_list.h" | 37 #include "ppapi/proxy/interface_list.h" |
37 #include "ppapi/proxy/plugin_globals.h" | 38 #include "ppapi/proxy/plugin_globals.h" |
38 #include "ppapi/proxy/ppapi_messages.h" | 39 #include "ppapi/proxy/ppapi_messages.h" |
39 #include "ppapi/shared_impl/api_id.h" | 40 #include "ppapi/shared_impl/api_id.h" |
40 #include "third_party/WebKit/public/web/WebKit.h" | 41 #include "third_party/WebKit/public/web/WebKit.h" |
41 #include "ui/base/ui_base_switches.h" | 42 #include "ui/base/ui_base_switches.h" |
42 #include "webkit/plugins/plugin_switches.h" | |
43 | 43 |
44 #if defined(OS_WIN) | 44 #if defined(OS_WIN) |
45 #include "base/win/win_util.h" | 45 #include "base/win/win_util.h" |
46 #include "base/win/windows_version.h" | 46 #include "base/win/windows_version.h" |
47 #include "sandbox/win/src/sandbox.h" | 47 #include "sandbox/win/src/sandbox.h" |
48 #elif defined(OS_MACOSX) | 48 #elif defined(OS_MACOSX) |
49 #include "content/common/sandbox_init_mac.h" | 49 #include "content/common/sandbox_init_mac.h" |
50 #endif | 50 #endif |
51 | 51 |
52 #if defined(OS_WIN) | 52 #if defined(OS_WIN) |
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
511 histogram_name.str(), | 511 histogram_name.str(), |
512 1, | 512 1, |
513 LOAD_RESULT_MAX, | 513 LOAD_RESULT_MAX, |
514 LOAD_RESULT_MAX + 1, | 514 LOAD_RESULT_MAX + 1, |
515 base::HistogramBase::kUmaTargetedHistogramFlag); | 515 base::HistogramBase::kUmaTargetedHistogramFlag); |
516 | 516 |
517 histogram->Add(result); | 517 histogram->Add(result); |
518 } | 518 } |
519 | 519 |
520 } // namespace content | 520 } // namespace content |
OLD | NEW |