| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1871 // done here either. | 1871 // done here either. |
| 1872 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) | 1872 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) |
| 1873 frame_tree_node_->DidStartLoading(true); | 1873 frame_tree_node_->DidStartLoading(true); |
| 1874 } | 1874 } |
| 1875 | 1875 |
| 1876 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { | 1876 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { |
| 1877 DCHECK(data_url.SchemeIs(url::kDataScheme)); | 1877 DCHECK(data_url.SchemeIs(url::kDataScheme)); |
| 1878 CommonNavigationParams common_params( | 1878 CommonNavigationParams common_params( |
| 1879 data_url, Referrer(), ui::PAGE_TRANSITION_LINK, | 1879 data_url, Referrer(), ui::PAGE_TRANSITION_LINK, |
| 1880 FrameMsg_Navigate_Type::NORMAL, false, false, base::TimeTicks::Now(), | 1880 FrameMsg_Navigate_Type::NORMAL, false, false, base::TimeTicks::Now(), |
| 1881 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(), LOFI_OFF, | 1881 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(), |
| 1882 base::TimeTicks::Now()); | 1882 std::string(), LOFI_OFF, base::TimeTicks::Now()); |
| 1883 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 1883 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 1884 switches::kEnableBrowserSideNavigation)) { | 1884 switches::kEnableBrowserSideNavigation)) { |
| 1885 CommitNavigation(nullptr, nullptr, common_params, | 1885 CommitNavigation(nullptr, nullptr, common_params, |
| 1886 RequestNavigationParams()); | 1886 RequestNavigationParams()); |
| 1887 } else { | 1887 } else { |
| 1888 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); | 1888 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); |
| 1889 } | 1889 } |
| 1890 } | 1890 } |
| 1891 | 1891 |
| 1892 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, | 1892 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, |
| (...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2500 *dst = src; | 2500 *dst = src; |
| 2501 | 2501 |
| 2502 if (src.routing_id != -1) | 2502 if (src.routing_id != -1) |
| 2503 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); | 2503 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); |
| 2504 | 2504 |
| 2505 if (src.parent_routing_id != -1) | 2505 if (src.parent_routing_id != -1) |
| 2506 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); | 2506 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); |
| 2507 } | 2507 } |
| 2508 | 2508 |
| 2509 } // namespace content | 2509 } // namespace content |
| OLD | NEW |