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

Side by Side Diff: content/ppapi_plugin/ppapi_plugin_main.cc

Issue 1642213002: Move font_warmup_win, fix webrtc dep. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « content/content_tests.gypi ('k') | content/ppapi_plugin/ppapi_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 11 matching lines...) Expand all
22 #include "content/public/plugin/content_plugin_client.h" 22 #include "content/public/plugin/content_plugin_client.h"
23 #include "ipc/ipc_sender.h" 23 #include "ipc/ipc_sender.h"
24 #include "ppapi/proxy/plugin_globals.h" 24 #include "ppapi/proxy/plugin_globals.h"
25 #include "ppapi/proxy/proxy_module.h" 25 #include "ppapi/proxy/proxy_module.h"
26 #include "ui/base/ui_base_switches.h" 26 #include "ui/base/ui_base_switches.h"
27 27
28 #if defined(OS_WIN) 28 #if defined(OS_WIN)
29 #include "base/win/win_util.h" 29 #include "base/win/win_util.h"
30 #include "base/win/windows_version.h" 30 #include "base/win/windows_version.h"
31 #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"
32 #include "content/common/font_warmup_win.h" 32 #include "content/child/font_warmup_win.h"
33 #include "content/public/common/dwrite_font_platform_win.h" 33 #include "content/public/common/dwrite_font_platform_win.h"
34 #include "sandbox/win/src/sandbox.h" 34 #include "sandbox/win/src/sandbox.h"
35 #include "third_party/WebKit/public/web/win/WebFontRendering.h" 35 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
36 #include "third_party/skia/include/ports/SkTypeface_win.h" 36 #include "third_party/skia/include/ports/SkTypeface_win.h"
37 #include "ui/gfx/win/direct_write.h" 37 #include "ui/gfx/win/direct_write.h"
38 #include "ui/gfx/win/dpi.h" 38 #include "ui/gfx/win/dpi.h"
39 #endif 39 #endif
40 40
41 #if defined(OS_CHROMEOS) 41 #if defined(OS_CHROMEOS)
42 #include "base/files/file_util.h" 42 #include "base/files/file_util.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 main_message_loop.Run(); 160 main_message_loop.Run();
161 161
162 #if defined(OS_WIN) 162 #if defined(OS_WIN)
163 if (ShouldUseDirectWriteFontProxyFieldTrial()) 163 if (ShouldUseDirectWriteFontProxyFieldTrial())
164 UninitializeDWriteFontProxy(); 164 UninitializeDWriteFontProxy();
165 #endif 165 #endif
166 return 0; 166 return 0;
167 } 167 }
168 168
169 } // namespace content 169 } // namespace content
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/ppapi_plugin/ppapi_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698