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/browser/browser_main_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/metrics/field_trial.h" | 12 #include "base/metrics/field_trial.h" |
13 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
14 #include "base/pending_task.h" | 14 #include "base/pending_task.h" |
15 #include "base/power_monitor/power_monitor.h" | 15 #include "base/power_monitor/power_monitor.h" |
| 16 #include "base/process/process_metrics.h" |
16 #include "base/run_loop.h" | 17 #include "base/run_loop.h" |
17 #include "base/strings/string_number_conversions.h" | 18 #include "base/strings/string_number_conversions.h" |
18 #include "base/system_monitor/system_monitor.h" | 19 #include "base/system_monitor/system_monitor.h" |
19 #include "base/threading/thread_restrictions.h" | 20 #include "base/threading/thread_restrictions.h" |
20 #include "base/timer/hi_res_timer_manager.h" | 21 #include "base/timer/hi_res_timer_manager.h" |
21 #include "content/browser/browser_thread_impl.h" | 22 #include "content/browser/browser_thread_impl.h" |
22 #include "content/browser/device_orientation/device_motion_service.h" | 23 #include "content/browser/device_orientation/device_motion_service.h" |
23 #include "content/browser/download/save_file_manager.h" | 24 #include "content/browser/download/save_file_manager.h" |
24 #include "content/browser/gamepad/gamepad_service.h" | 25 #include "content/browser/gamepad/gamepad_service.h" |
25 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" | 26 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 #include "content/browser/device_monitor_mac.h" | 85 #include "content/browser/device_monitor_mac.h" |
85 #endif | 86 #endif |
86 | 87 |
87 #if defined(TOOLKIT_GTK) | 88 #if defined(TOOLKIT_GTK) |
88 #include "ui/gfx/gtk_util.h" | 89 #include "ui/gfx/gtk_util.h" |
89 #endif | 90 #endif |
90 | 91 |
91 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 92 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
92 #include <sys/stat.h> | 93 #include <sys/stat.h> |
93 | 94 |
94 #include "base/process_util.h" | |
95 #include "content/browser/renderer_host/render_sandbox_host_linux.h" | 95 #include "content/browser/renderer_host/render_sandbox_host_linux.h" |
96 #include "content/browser/zygote_host/zygote_host_impl_linux.h" | 96 #include "content/browser/zygote_host/zygote_host_impl_linux.h" |
97 #endif | 97 #endif |
98 | 98 |
99 #if defined(USE_X11) | 99 #if defined(USE_X11) |
100 #include <X11/Xlib.h> | 100 #include <X11/Xlib.h> |
101 #endif | 101 #endif |
102 | 102 |
103 // One of the linux specific headers defines this as a macro. | 103 // One of the linux specific headers defines this as a macro. |
104 #ifdef DestroyAll | 104 #ifdef DestroyAll |
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
887 if (parameters_.ui_task) | 887 if (parameters_.ui_task) |
888 base::MessageLoopForUI::current()->PostTask(FROM_HERE, | 888 base::MessageLoopForUI::current()->PostTask(FROM_HERE, |
889 *parameters_.ui_task); | 889 *parameters_.ui_task); |
890 | 890 |
891 base::RunLoop run_loop; | 891 base::RunLoop run_loop; |
892 run_loop.Run(); | 892 run_loop.Run(); |
893 #endif | 893 #endif |
894 } | 894 } |
895 | 895 |
896 } // namespace content | 896 } // namespace content |
OLD | NEW |