Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Side by Side Diff: content/gpu/gpu_main.cc

Issue 2684433003: Files required by a service now listed in manifest. (Closed)
Patch Set: Fix build. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <stddef.h> 5 #include <stddef.h>
6 #include <stdlib.h> 6 #include <stdlib.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/metrics/statistics_recorder.h" 14 #include "base/metrics/statistics_recorder.h"
15 #include "base/rand_util.h" 15 #include "base/rand_util.h"
16 #include "base/run_loop.h" 16 #include "base/run_loop.h"
17 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
18 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
19 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" 19 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
20 #include "base/threading/platform_thread.h" 20 #include "base/threading/platform_thread.h"
21 #include "base/trace_event/trace_event.h" 21 #include "base/trace_event/trace_event.h"
22 #include "build/build_config.h" 22 #include "build/build_config.h"
23 #include "content/child/child_process.h" 23 #include "content/child/child_process.h"
24 #include "content/common/content_constants_internal.h" 24 #include "content/common/content_constants_internal.h"
25 #include "content/common/gpu_host_messages.h" 25 #include "content/common/gpu_host_messages.h"
26 #include "content/common/sandbox_linux/sandbox_linux.h"
27 #include "content/gpu/gpu_child_thread.h" 26 #include "content/gpu/gpu_child_thread.h"
28 #include "content/gpu/gpu_process.h" 27 #include "content/gpu/gpu_process.h"
29 #include "content/public/common/content_client.h" 28 #include "content/public/common/content_client.h"
30 #include "content/public/common/content_switches.h" 29 #include "content/public/common/content_switches.h"
31 #include "content/public/common/main_function_params.h" 30 #include "content/public/common/main_function_params.h"
32 #include "content/public/common/result_codes.h" 31 #include "content/public/common/result_codes.h"
33 #include "gpu/command_buffer/service/gpu_switches.h" 32 #include "gpu/command_buffer/service/gpu_switches.h"
34 #include "gpu/config/gpu_driver_bug_list.h" 33 #include "gpu/config/gpu_driver_bug_list.h"
35 #include "gpu/config/gpu_info_collector.h" 34 #include "gpu/config/gpu_info_collector.h"
36 #include "gpu/config/gpu_switches.h" 35 #include "gpu/config/gpu_switches.h"
(...skipping 29 matching lines...) Expand all
66 #include "media/gpu/media_foundation_video_encode_accelerator_win.h" 65 #include "media/gpu/media_foundation_video_encode_accelerator_win.h"
67 #include "sandbox/win/src/sandbox.h" 66 #include "sandbox/win/src/sandbox.h"
68 #endif 67 #endif
69 68
70 #if defined(USE_X11) 69 #if defined(USE_X11)
71 #include "ui/base/x/x11_util.h" // nogncheck 70 #include "ui/base/x/x11_util.h" // nogncheck
72 #include "ui/gfx/x/x11_switches.h" // nogncheck 71 #include "ui/gfx/x/x11_switches.h" // nogncheck
73 #endif 72 #endif
74 73
75 #if defined(OS_LINUX) 74 #if defined(OS_LINUX)
75 #include "content/common/sandbox_linux/sandbox_linux.h"
76 #include "content/public/common/sandbox_init.h" 76 #include "content/public/common/sandbox_init.h"
77 #endif 77 #endif
78 78
79 #if defined(OS_MACOSX) 79 #if defined(OS_MACOSX)
80 #include "base/message_loop/message_pump_mac.h" 80 #include "base/message_loop/message_pump_mac.h"
81 #include "content/common/sandbox_mac.h" 81 #include "content/common/sandbox_mac.h"
82 #endif 82 #endif
83 83
84 #if defined(USE_OZONE) 84 #if defined(USE_OZONE)
85 #include "ui/ozone/public/ozone_platform.h" 85 #include "ui/ozone/public/ozone_platform.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 return true; 361 return true;
362 } 362 }
363 363
364 return false; 364 return false;
365 } 365 }
366 #endif // defined(OS_WIN) 366 #endif // defined(OS_WIN)
367 367
368 } // namespace. 368 } // namespace.
369 369
370 } // namespace content 370 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/service_manager/service_manager_context.cc ('k') | content/ppapi_plugin/ppapi_plugin_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698