OLD | NEW |
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 2490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2501 OnDidStartLoading(true); | 2501 OnDidStartLoading(true); |
2502 } | 2502 } |
2503 } | 2503 } |
2504 | 2504 |
2505 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { | 2505 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { |
2506 DCHECK(data_url.SchemeIs(url::kDataScheme)); | 2506 DCHECK(data_url.SchemeIs(url::kDataScheme)); |
2507 CommonNavigationParams common_params( | 2507 CommonNavigationParams common_params( |
2508 data_url, Referrer(), ui::PAGE_TRANSITION_LINK, | 2508 data_url, Referrer(), ui::PAGE_TRANSITION_LINK, |
2509 FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT, false, false, | 2509 FrameMsg_Navigate_Type::DIFFERENT_DOCUMENT, false, false, |
2510 base::TimeTicks::Now(), FrameMsg_UILoadMetricsReportType::NO_REPORT, | 2510 base::TimeTicks::Now(), FrameMsg_UILoadMetricsReportType::NO_REPORT, |
2511 GURL(), GURL(), PREVIEWS_OFF, base::TimeTicks::Now(), "GET", nullptr); | 2511 GURL(), GURL(), PREVIEWS_OFF, base::TimeTicks::Now(), "GET", nullptr, |
| 2512 base::Optional<SourceLocation>()); |
2512 if (IsBrowserSideNavigationEnabled()) { | 2513 if (IsBrowserSideNavigationEnabled()) { |
2513 CommitNavigation(nullptr, nullptr, common_params, RequestNavigationParams(), | 2514 CommitNavigation(nullptr, nullptr, common_params, RequestNavigationParams(), |
2514 false); | 2515 false); |
2515 } else { | 2516 } else { |
2516 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); | 2517 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); |
2517 } | 2518 } |
2518 } | 2519 } |
2519 | 2520 |
2520 void RenderFrameHostImpl::Stop() { | 2521 void RenderFrameHostImpl::Stop() { |
2521 Send(new FrameMsg_Stop(routing_id_)); | 2522 Send(new FrameMsg_Stop(routing_id_)); |
(...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3496 GetUserData(kRenderFrameHostAndroidKey)); | 3497 GetUserData(kRenderFrameHostAndroidKey)); |
3497 if (!render_frame_host_android) { | 3498 if (!render_frame_host_android) { |
3498 render_frame_host_android = new RenderFrameHostAndroid(this); | 3499 render_frame_host_android = new RenderFrameHostAndroid(this); |
3499 SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android); | 3500 SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android); |
3500 } | 3501 } |
3501 return render_frame_host_android->GetJavaObject(); | 3502 return render_frame_host_android->GetJavaObject(); |
3502 } | 3503 } |
3503 #endif | 3504 #endif |
3504 | 3505 |
3505 } // namespace content | 3506 } // namespace content |
OLD | NEW |