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

Side by Side Diff: content/browser/frame_host/navigation_handle_impl.cc

Issue 2534393003: (Reland) Remove about:srcdoc url conversion. (Closed)
Patch Set: Rebase. Created 4 years 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/browser/frame_host/navigation_handle_impl.h" 5 #include "content/browser/frame_host/navigation_handle_impl.h"
6 6
7 #include "base/debug/dump_without_crashing.h" 7 #include "base/debug/dump_without_crashing.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "content/browser/browsing_data/clear_site_data_throttle.h" 9 #include "content/browser/browsing_data/clear_site_data_throttle.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 } 46 }
47 47
48 } // namespace 48 } // namespace
49 49
50 // static 50 // static
51 std::unique_ptr<NavigationHandleImpl> NavigationHandleImpl::Create( 51 std::unique_ptr<NavigationHandleImpl> NavigationHandleImpl::Create(
52 const GURL& url, 52 const GURL& url,
53 FrameTreeNode* frame_tree_node, 53 FrameTreeNode* frame_tree_node,
54 bool is_renderer_initiated, 54 bool is_renderer_initiated,
55 bool is_same_page, 55 bool is_same_page,
56 bool is_srcdoc,
57 const base::TimeTicks& navigation_start, 56 const base::TimeTicks& navigation_start,
58 int pending_nav_entry_id, 57 int pending_nav_entry_id,
59 NavigationGesture gesture, 58 NavigationGesture gesture,
60 bool started_from_context_menu) { 59 bool started_from_context_menu) {
61 return std::unique_ptr<NavigationHandleImpl>(new NavigationHandleImpl( 60 return std::unique_ptr<NavigationHandleImpl>(new NavigationHandleImpl(
62 url, frame_tree_node, is_renderer_initiated, is_same_page, is_srcdoc, 61 url, frame_tree_node, is_renderer_initiated, is_same_page,
63 navigation_start, pending_nav_entry_id, gesture, 62 navigation_start, pending_nav_entry_id, gesture,
64 started_from_context_menu)); 63 started_from_context_menu));
65 } 64 }
66 65
67 NavigationHandleImpl::NavigationHandleImpl( 66 NavigationHandleImpl::NavigationHandleImpl(
68 const GURL& url, 67 const GURL& url,
69 FrameTreeNode* frame_tree_node, 68 FrameTreeNode* frame_tree_node,
70 bool is_renderer_initiated, 69 bool is_renderer_initiated,
71 bool is_same_page, 70 bool is_same_page,
72 bool is_srcdoc,
73 const base::TimeTicks& navigation_start, 71 const base::TimeTicks& navigation_start,
74 int pending_nav_entry_id, 72 int pending_nav_entry_id,
75 NavigationGesture gesture, 73 NavigationGesture gesture,
76 bool started_from_context_menu) 74 bool started_from_context_menu)
77 : url_(url), 75 : url_(url),
78 gesture_(gesture), 76 gesture_(gesture),
79 transition_(ui::PAGE_TRANSITION_LINK), 77 transition_(ui::PAGE_TRANSITION_LINK),
80 is_external_protocol_(false), 78 is_external_protocol_(false),
81 net_error_code_(net::OK), 79 net_error_code_(net::OK),
82 render_frame_host_(nullptr), 80 render_frame_host_(nullptr),
83 is_renderer_initiated_(is_renderer_initiated), 81 is_renderer_initiated_(is_renderer_initiated),
84 is_same_page_(is_same_page), 82 is_same_page_(is_same_page),
85 is_srcdoc_(is_srcdoc),
86 was_redirected_(false), 83 was_redirected_(false),
87 connection_info_(net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN), 84 connection_info_(net::HttpResponseInfo::CONNECTION_INFO_UNKNOWN),
88 original_url_(url), 85 original_url_(url),
89 state_(INITIAL), 86 state_(INITIAL),
90 is_transferring_(false), 87 is_transferring_(false),
91 frame_tree_node_(frame_tree_node), 88 frame_tree_node_(frame_tree_node),
92 next_index_(0), 89 next_index_(0),
93 navigation_start_(navigation_start), 90 navigation_start_(navigation_start),
94 pending_nav_entry_id_(pending_nav_entry_id), 91 pending_nav_entry_id_(pending_nav_entry_id),
95 request_context_type_(REQUEST_CONTEXT_TYPE_UNSPECIFIED), 92 request_context_type_(REQUEST_CONTEXT_TYPE_UNSPECIFIED),
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 if (frame_tree_node_->parent()) 161 if (frame_tree_node_->parent())
165 return frame_tree_node_->parent()->IsMainFrame(); 162 return frame_tree_node_->parent()->IsMainFrame();
166 163
167 return false; 164 return false;
168 } 165 }
169 166
170 bool NavigationHandleImpl::IsRendererInitiated() { 167 bool NavigationHandleImpl::IsRendererInitiated() {
171 return is_renderer_initiated_; 168 return is_renderer_initiated_;
172 } 169 }
173 170
174 bool NavigationHandleImpl::IsSrcdoc() {
175 return is_srcdoc_;
176 }
177
178 bool NavigationHandleImpl::WasServerRedirect() { 171 bool NavigationHandleImpl::WasServerRedirect() {
179 return was_redirected_; 172 return was_redirected_;
180 } 173 }
181 174
182 int NavigationHandleImpl::GetFrameTreeNodeId() { 175 int NavigationHandleImpl::GetFrameTreeNodeId() {
183 return frame_tree_node_->frame_tree_node_id(); 176 return frame_tree_node_->frame_tree_node_id();
184 } 177 }
185 178
186 int NavigationHandleImpl::GetParentFrameTreeNodeId() { 179 int NavigationHandleImpl::GetParentFrameTreeNodeId() {
187 if (frame_tree_node_->IsMainFrame()) 180 if (frame_tree_node_->IsMainFrame())
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 throttles_to_register.push_back(std::move(clear_site_data_throttle)); 781 throttles_to_register.push_back(std::move(clear_site_data_throttle));
789 782
790 if (throttles_to_register.size() > 0) { 783 if (throttles_to_register.size() > 0) {
791 throttles_.insert(throttles_.begin(), throttles_to_register.begin(), 784 throttles_.insert(throttles_.begin(), throttles_to_register.begin(),
792 throttles_to_register.end()); 785 throttles_to_register.end());
793 throttles_to_register.weak_clear(); 786 throttles_to_register.weak_clear();
794 } 787 }
795 } 788 }
796 789
797 } // namespace content 790 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl.h ('k') | content/browser/frame_host/navigation_handle_impl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698