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

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

Issue 2949853002: Rename is_same_page to is_same_document in NavigationHandle. (Closed)
Patch Set: Created 3 years, 6 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/browser/frame_host/navigator_impl.h" 5 #include "content/browser/frame_host/navigator_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 pending_nav_entry_id = pending_entry->GetUniqueID(); 222 pending_nav_entry_id = pending_entry->GetUniqueID();
223 started_from_context_menu = pending_entry->has_started_from_context_menu(); 223 started_from_context_menu = pending_entry->has_started_from_context_menu();
224 } 224 }
225 225
226 std::vector<GURL> validated_redirect_chain = redirect_chain; 226 std::vector<GURL> validated_redirect_chain = redirect_chain;
227 for (size_t i = 0; i < validated_redirect_chain.size(); ++i) 227 for (size_t i = 0; i < validated_redirect_chain.size(); ++i)
228 render_process_host->FilterURL(false, &validated_redirect_chain[i]); 228 render_process_host->FilterURL(false, &validated_redirect_chain[i]);
229 render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create( 229 render_frame_host->SetNavigationHandle(NavigationHandleImpl::Create(
230 validated_url, validated_redirect_chain, 230 validated_url, validated_redirect_chain,
231 render_frame_host->frame_tree_node(), is_renderer_initiated, 231 render_frame_host->frame_tree_node(), is_renderer_initiated,
232 false, // is_same_page 232 false, // is_same_document
233 navigation_start, pending_nav_entry_id, started_from_context_menu, 233 navigation_start, pending_nav_entry_id, started_from_context_menu,
234 CSPDisposition::CHECK, // should_check_main_world_csp 234 CSPDisposition::CHECK, // should_check_main_world_csp
235 false)); // is_form_submission 235 false)); // is_form_submission
236 } 236 }
237 237
238 void NavigatorImpl::DidFailProvisionalLoadWithError( 238 void NavigatorImpl::DidFailProvisionalLoadWithError(
239 RenderFrameHostImpl* render_frame_host, 239 RenderFrameHostImpl* render_frame_host,
240 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 240 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
241 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec() 241 VLOG(1) << "Failed Provisional Load: " << params.url.possibly_invalid_spec()
242 << ", error_code: " << params.error_code 242 << ", error_code: " << params.error_code
(...skipping 1055 matching lines...) Expand 10 before | Expand all | Expand 10 after
1298 if (navigation_handle) 1298 if (navigation_handle)
1299 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); 1299 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID());
1300 1300
1301 controller_->SetPendingEntry(std::move(entry)); 1301 controller_->SetPendingEntry(std::move(entry));
1302 if (delegate_) 1302 if (delegate_)
1303 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); 1303 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
1304 } 1304 }
1305 } 1305 }
1306 1306
1307 } // namespace content 1307 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_handle_impl.cc ('k') | content/public/browser/navigation_handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698