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

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

Issue 1352813006: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Doesn't try to create a WebUI if URL is invalid (fixes unit_tests). Created 5 years, 2 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 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 int flags) 51 int flags,
52 const GURL& dest_url,
53 int entry_bindings)
52 : RenderFrameHostImpl(site_instance, 54 : RenderFrameHostImpl(site_instance,
53 render_view_host, 55 render_view_host,
54 delegate, 56 delegate,
55 rwh_delegate, 57 rwh_delegate,
56 frame_tree, 58 frame_tree,
57 frame_tree_node, 59 frame_tree_node,
58 routing_id, 60 routing_id,
59 widget_routing_id, 61 widget_routing_id,
60 flags), 62 flags,
63 dest_url,
64 entry_bindings),
61 child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL), 65 child_creation_observer_(delegate ? delegate->GetAsWebContents() : NULL),
62 contents_mime_type_("text/html"), 66 contents_mime_type_("text/html"),
63 simulate_history_list_was_cleared_(false) {} 67 simulate_history_list_was_cleared_(false) {}
64 68
65 TestRenderFrameHost::~TestRenderFrameHost() { 69 TestRenderFrameHost::~TestRenderFrameHost() {
66 } 70 }
67 71
68 TestRenderViewHost* TestRenderFrameHost::GetRenderViewHost() { 72 TestRenderViewHost* TestRenderFrameHost::GetRenderViewHost() {
69 return static_cast<TestRenderViewHost*>( 73 return static_cast<TestRenderViewHost*>(
70 RenderFrameHostImpl::GetRenderViewHost()); 74 RenderFrameHostImpl::GetRenderViewHost());
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 // cleared during DidFailProvisionalLoad). 407 // cleared during DidFailProvisionalLoad).
404 int page_id = entry ? entry->GetPageID() : -1; 408 int page_id = entry ? entry->GetPageID() : -1;
405 if (page_id == -1) { 409 if (page_id == -1) {
406 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate()); 410 WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(delegate());
407 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1; 411 page_id = web_contents->GetMaxPageIDForSiteInstance(GetSiteInstance()) + 1;
408 } 412 }
409 return page_id; 413 return page_id;
410 } 414 }
411 415
412 } // namespace content 416 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698