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

Side by Side Diff: content/test/layouttest_support.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/renderer/renderer_main_platform_delegate_win.cc ('k') | no next file » | 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 "content/public/test/layouttest_support.h" 5 #include "content/public/test/layouttest_support.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 23 matching lines...) Expand all
34 #include "third_party/WebKit/public/platform/WebBatteryStatus.h" 34 #include "third_party/WebKit/public/platform/WebBatteryStatus.h"
35 #include "third_party/WebKit/public/platform/WebGamepads.h" 35 #include "third_party/WebKit/public/platform/WebGamepads.h"
36 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDevic eMotionData.h" 36 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDevic eMotionData.h"
37 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDevic eOrientationData.h" 37 #include "third_party/WebKit/public/platform/modules/device_orientation/WebDevic eOrientationData.h"
38 #include "third_party/WebKit/public/web/WebHistoryItem.h" 38 #include "third_party/WebKit/public/web/WebHistoryItem.h"
39 #include "third_party/WebKit/public/web/WebView.h" 39 #include "third_party/WebKit/public/web/WebView.h"
40 40
41 #if defined(OS_MACOSX) 41 #if defined(OS_MACOSX)
42 #include "content/browser/frame_host/popup_menu_helper_mac.h" 42 #include "content/browser/frame_host/popup_menu_helper_mac.h"
43 #elif defined(OS_WIN) 43 #elif defined(OS_WIN)
44 #include "content/common/font_warmup_win.h" 44 #include "content/child/font_warmup_win.h"
45 #include "content/public/common/dwrite_font_platform_win.h" 45 #include "content/public/common/dwrite_font_platform_win.h"
46 #include "third_party/WebKit/public/web/win/WebFontRendering.h" 46 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
47 #include "third_party/skia/include/ports/SkFontMgr.h" 47 #include "third_party/skia/include/ports/SkFontMgr.h"
48 #include "third_party/skia/include/ports/SkTypeface_win.h" 48 #include "third_party/skia/include/ports/SkTypeface_win.h"
49 #include "ui/gfx/win/direct_write.h" 49 #include "ui/gfx/win/direct_write.h"
50 #endif 50 #endif
51 51
52 using blink::WebBatteryStatus; 52 using blink::WebBatteryStatus;
53 using blink::WebDeviceMotionData; 53 using blink::WebDeviceMotionData;
54 using blink::WebDeviceOrientationData; 54 using blink::WebDeviceOrientationData;
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 result.append( 461 result.append(
462 DumpHistoryItem(entry->root_history_node(), 462 DumpHistoryItem(entry->root_history_node(),
463 8, 463 8,
464 index == current_index)); 464 index == current_index));
465 } 465 }
466 result.append("===============================================\n"); 466 result.append("===============================================\n");
467 return result; 467 return result;
468 } 468 }
469 469
470 } // namespace content 470 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/renderer_main_platform_delegate_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698