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

Side by Side Diff: content/ppapi_plugin/ppapi_plugin_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 "base/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/debug/crash_logging.h" 7 #include "base/debug/crash_logging.h"
8 #include "base/debug/debugger.h" 8 #include "base/debug/debugger.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/threading/platform_thread.h" 15 #include "base/threading/platform_thread.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "content/child/child_process.h" 17 #include "content/child/child_process.h"
18 #include "content/common/content_constants_internal.h" 18 #include "content/common/content_constants_internal.h"
19 #include "content/common/sandbox_linux/sandbox_linux.h"
20 #include "content/ppapi_plugin/ppapi_thread.h" 19 #include "content/ppapi_plugin/ppapi_thread.h"
21 #include "content/public/common/content_client.h" 20 #include "content/public/common/content_client.h"
22 #include "content/public/common/content_switches.h" 21 #include "content/public/common/content_switches.h"
23 #include "content/public/common/main_function_params.h" 22 #include "content/public/common/main_function_params.h"
24 #include "ipc/ipc_sender.h" 23 #include "ipc/ipc_sender.h"
25 #include "ppapi/proxy/plugin_globals.h" 24 #include "ppapi/proxy/plugin_globals.h"
26 #include "ppapi/proxy/proxy_module.h" 25 #include "ppapi/proxy/proxy_module.h"
27 #include "ui/base/ui_base_switches.h" 26 #include "ui/base/ui_base_switches.h"
28 27
29 #if defined(OS_WIN) 28 #if defined(OS_WIN)
30 #include "base/win/win_util.h" 29 #include "base/win/win_util.h"
31 #include "base/win/windows_version.h" 30 #include "base/win/windows_version.h"
32 #include "content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h" 31 #include "content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h"
33 #include "sandbox/win/src/sandbox.h" 32 #include "sandbox/win/src/sandbox.h"
34 #include "third_party/WebKit/public/web/win/WebFontRendering.h" 33 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
35 #include "third_party/skia/include/ports/SkTypeface_win.h" 34 #include "third_party/skia/include/ports/SkTypeface_win.h"
36 #include "ui/gfx/font_render_params.h" 35 #include "ui/gfx/font_render_params.h"
37 #include "ui/gfx/win/direct_write.h" 36 #include "ui/gfx/win/direct_write.h"
38 #endif 37 #endif
39 38
40 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
41 #include "base/files/file_util.h" 40 #include "base/files/file_util.h"
42 #endif 41 #endif
43 42
44 #if defined(OS_LINUX) 43 #if defined(OS_LINUX)
44 #include "content/common/sandbox_linux/sandbox_linux.h"
45 #include "content/public/common/sandbox_init.h" 45 #include "content/public/common/sandbox_init.h"
46 #endif 46 #endif
47 47
48 #ifdef V8_USE_EXTERNAL_STARTUP_DATA 48 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
49 #include "gin/v8_initializer.h" 49 #include "gin/v8_initializer.h"
50 #endif 50 #endif
51 51
52 #if defined(OS_POSIX) && !defined(OS_ANDROID) 52 #if defined(OS_POSIX) && !defined(OS_ANDROID)
53 #include <stdlib.h> 53 #include <stdlib.h>
54 #endif 54 #endif
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 156
157 base::RunLoop().Run(); 157 base::RunLoop().Run();
158 158
159 #if defined(OS_WIN) 159 #if defined(OS_WIN)
160 UninitializeDWriteFontProxy(); 160 UninitializeDWriteFontProxy();
161 #endif 161 #endif
162 return 0; 162 return 0;
163 } 163 }
164 164
165 } // namespace content 165 } // namespace content
OLDNEW
« no previous file with comments | « content/gpu/gpu_main.cc ('k') | content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698