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

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

Issue 2720763002: PlzNavigate: preserve SourceLocation when navigating (Closed)
Patch Set: PlzNavigate: preserve SourceLocation when navigating Created 3 years, 9 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/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 2466 matching lines...) Expand 10 before | Expand all | Expand 10 after
2477 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) 2477 if (!common_params.url.SchemeIs(url::kJavaScriptScheme))
2478 OnDidStartLoading(true); 2478 OnDidStartLoading(true);
2479 } 2479 }
2480 2480
2481 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { 2481 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) {
2482 DCHECK(data_url.SchemeIs(url::kDataScheme)); 2482 DCHECK(data_url.SchemeIs(url::kDataScheme));
2483 CommonNavigationParams common_params( 2483 CommonNavigationParams common_params(
2484 data_url, Referrer(), ui::PAGE_TRANSITION_LINK, 2484 data_url, Referrer(), ui::PAGE_TRANSITION_LINK,
2485 FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT, false, false, 2485 FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT, false, false,
2486 base::TimeTicks::Now(), FrameMsg_UILoadMetricsReportType::NO_REPORT, 2486 base::TimeTicks::Now(), FrameMsg_UILoadMetricsReportType::NO_REPORT,
2487 GURL(), GURL(), PREVIEWS_OFF, base::TimeTicks::Now(), "GET", nullptr); 2487 GURL(), GURL(), PREVIEWS_OFF, base::TimeTicks::Now(), "GET", nullptr,
2488 base::Optional<SourceLocation>());
2488 if (IsBrowserSideNavigationEnabled()) { 2489 if (IsBrowserSideNavigationEnabled()) {
2489 CommitNavigation(nullptr, nullptr, common_params, RequestNavigationParams(), 2490 CommitNavigation(nullptr, nullptr, common_params, RequestNavigationParams(),
2490 false); 2491 false);
2491 } else { 2492 } else {
2492 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); 2493 Navigate(common_params, StartNavigationParams(), RequestNavigationParams());
2493 } 2494 }
2494 } 2495 }
2495 2496
2496 void RenderFrameHostImpl::Stop() { 2497 void RenderFrameHostImpl::Stop() {
2497 Send(new FrameMsg_Stop(routing_id_)); 2498 Send(new FrameMsg_Stop(routing_id_));
(...skipping 961 matching lines...) Expand 10 before | Expand all | Expand 10 after
3459 // There is no pending NavigationEntry in these cases, so pass 0 as the 3460 // There is no pending NavigationEntry in these cases, so pass 0 as the
3460 // pending_nav_entry_id. If the previous handle was a prematurely aborted 3461 // pending_nav_entry_id. If the previous handle was a prematurely aborted
3461 // navigation loaded via LoadDataWithBaseURL, propagate the entry id. 3462 // navigation loaded via LoadDataWithBaseURL, propagate the entry id.
3462 return NavigationHandleImpl::Create( 3463 return NavigationHandleImpl::Create(
3463 params.url, params.redirects, frame_tree_node_, is_renderer_initiated, 3464 params.url, params.redirects, frame_tree_node_, is_renderer_initiated,
3464 params.was_within_same_page, base::TimeTicks::Now(), 3465 params.was_within_same_page, base::TimeTicks::Now(),
3465 entry_id_for_data_nav, false); // started_from_context_menu 3466 entry_id_for_data_nav, false); // started_from_context_menu
3466 } 3467 }
3467 3468
3468 } // namespace content 3469 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698