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

Side by Side Diff: content/test/layouttest_support.cc

Issue 501583003: Move external popup menus from WebViewClient to WebFrameClient, part 3/3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_impl.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 "base/callback.h" 7 #include "base/callback.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "cc/blink/web_layer_impl.h" 9 #include "cc/blink/web_layer_impl.h"
10 #include "content/browser/renderer_host/render_widget_host_impl.h" 10 #include "content/browser/renderer_host/render_widget_host_impl.h"
11 #include "content/common/gpu/image_transport_surface.h" 11 #include "content/common/gpu/image_transport_surface.h"
12 #include "content/public/common/page_state.h" 12 #include "content/public/common/page_state.h"
13 #include "content/public/renderer/renderer_gamepad_provider.h" 13 #include "content/public/renderer/renderer_gamepad_provider.h"
14 #include "content/renderer/history_entry.h" 14 #include "content/renderer/history_entry.h"
15 #include "content/renderer/history_serialization.h" 15 #include "content/renderer/history_serialization.h"
16 #include "content/renderer/render_frame_impl.h" 16 #include "content/renderer/render_frame_impl.h"
17 #include "content/renderer/render_thread_impl.h" 17 #include "content/renderer/render_thread_impl.h"
18 #include "content/renderer/render_view_impl.h" 18 #include "content/renderer/render_view_impl.h"
19 #include "content/renderer/renderer_webkitplatformsupport_impl.h" 19 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
20 #include "content/shell/renderer/test_runner/test_common.h" 20 #include "content/shell/renderer/test_runner/test_common.h"
21 #include "content/shell/renderer/test_runner/web_frame_test_proxy.h" 21 #include "content/shell/renderer/test_runner/web_frame_test_proxy.h"
22 #include "content/shell/renderer/test_runner/web_test_proxy.h" 22 #include "content/shell/renderer/test_runner/web_test_proxy.h"
23 #include "third_party/WebKit/public/platform/WebBatteryStatus.h" 23 #include "third_party/WebKit/public/platform/WebBatteryStatus.h"
24 #include "third_party/WebKit/public/platform/WebDeviceMotionData.h" 24 #include "third_party/WebKit/public/platform/WebDeviceMotionData.h"
25 #include "third_party/WebKit/public/platform/WebDeviceOrientationData.h" 25 #include "third_party/WebKit/public/platform/WebDeviceOrientationData.h"
26 #include "third_party/WebKit/public/platform/WebGamepads.h" 26 #include "third_party/WebKit/public/platform/WebGamepads.h"
27 #include "third_party/WebKit/public/web/WebHistoryItem.h" 27 #include "third_party/WebKit/public/web/WebHistoryItem.h"
28 28
29 #if defined(OS_MACOSX) 29 #if defined(OS_MACOSX)
30 #include "content/browser/renderer_host/popup_menu_helper_mac.h" 30 #include "content/browser/frame_host/popup_menu_helper_mac.h"
31 #endif 31 #endif
32 32
33 using blink::WebBatteryStatus; 33 using blink::WebBatteryStatus;
34 using blink::WebDeviceMotionData; 34 using blink::WebDeviceMotionData;
35 using blink::WebDeviceOrientationData; 35 using blink::WebDeviceOrientationData;
36 using blink::WebGamepad; 36 using blink::WebGamepad;
37 using blink::WebGamepads; 37 using blink::WebGamepads;
38 using blink::WebRect; 38 using blink::WebRect;
39 using blink::WebSize; 39 using blink::WebSize;
40 40
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 } 354 }
355 result.append("===============================================\n"); 355 result.append("===============================================\n");
356 return result; 356 return result;
357 } 357 }
358 358
359 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) { 359 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) {
360 return new cc_blink::WebLayerImpl(layer); 360 return new cc_blink::WebLayerImpl(layer);
361 } 361 }
362 362
363 } // namespace content 363 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698