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

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

Issue 1359163005: Remove surface_id from RenderWidget/RenderWidgetHost and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@channel_creation_preempt
Patch Set: fix more tests Created 5 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
« no previous file with comments | « content/test/test_render_frame_host.h ('k') | content/test/test_render_frame_host_factory.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/test/test_render_frame_host.h" 5 #include "content/test/test_render_frame_host.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/browser/frame_host/frame_tree.h" 8 #include "content/browser/frame_host/frame_tree.h"
9 #include "content/browser/frame_host/navigation_handle_impl.h" 9 #include "content/browser/frame_host/navigation_handle_impl.h"
10 #include "content/browser/frame_host/navigation_request.h" 10 #include "content/browser/frame_host/navigation_request.h"
(...skipping 30 matching lines...) Expand all
41 } 41 }
42 42
43 TestRenderFrameHost::TestRenderFrameHost(SiteInstance* site_instance, 43 TestRenderFrameHost::TestRenderFrameHost(SiteInstance* site_instance,
44 RenderViewHostImpl* render_view_host, 44 RenderViewHostImpl* render_view_host,
45 RenderFrameHostDelegate* delegate, 45 RenderFrameHostDelegate* delegate,
46 RenderWidgetHostDelegate* rwh_delegate, 46 RenderWidgetHostDelegate* rwh_delegate,
47 FrameTree* frame_tree, 47 FrameTree* frame_tree,
48 FrameTreeNode* frame_tree_node, 48 FrameTreeNode* frame_tree_node,
49 int32 routing_id, 49 int32 routing_id,
50 int32 widget_routing_id, 50 int32 widget_routing_id,
51 int32 surface_id,
52 int flags) 51 int flags)
53 : RenderFrameHostImpl(site_instance, 52 : RenderFrameHostImpl(site_instance,
54 render_view_host, 53 render_view_host,
55 delegate, 54 delegate,
56 rwh_delegate, 55 rwh_delegate,
57 frame_tree, 56 frame_tree,
58 frame_tree_node, 57 frame_tree_node,
59 routing_id, 58 routing_id,
60 widget_routing_id, 59 widget_routing_id,
61 surface_id,
62 flags), 60 flags),
63 child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL), 61 child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL),
64 contents_mime_type_("text/html"), 62 contents_mime_type_("text/html"),
65 simulate_history_list_was_cleared_(false) {} 63 simulate_history_list_was_cleared_(false) {}
66 64
67 TestRenderFrameHost::~TestRenderFrameHost() { 65 TestRenderFrameHost::~TestRenderFrameHost() {
68 } 66 }
69 67
70 TestRenderViewHost* TestRenderFrameHost::GetRenderViewHost() { 68 TestRenderViewHost* TestRenderFrameHost::GetRenderViewHost() {
71 return static_cast<TestRenderViewHost*>( 69 return static_cast<TestRenderViewHost*>(
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 // cleared during DidFailProvisionalLoad). 393 // cleared during DidFailProvisionalLoad).
396 int page_id = entry ? entry->GetPageID() : -1; 394 int page_id = entry ? entry->GetPageID() : -1;
397 if (page_id == -1) { 395 if (page_id == -1) {
398 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate()); 396 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate());
399 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1; 397 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1;
400 } 398 }
401 return page_id; 399 return page_id;
402 } 400 }
403 401
404 } // namespace content 402 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_render_frame_host.h ('k') | content/test/test_render_frame_host_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698