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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 1718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1729 // done here either. | 1729 // done here either. |
1730 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) | 1730 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) |
1731 frame_tree_node_->DidStartLoading(true); | 1731 frame_tree_node_->DidStartLoading(true); |
1732 } | 1732 } |
1733 | 1733 |
1734 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { | 1734 void RenderFrameHostImpl::NavigateToInterstitialURL(const GURL& data_url) { |
1735 DCHECK(data_url.SchemeIs(url::kDataScheme)); | 1735 DCHECK(data_url.SchemeIs(url::kDataScheme)); |
1736 CommonNavigationParams common_params( | 1736 CommonNavigationParams common_params( |
1737 data_url, Referrer(), ui::PAGE_TRANSITION_LINK, | 1737 data_url, Referrer(), ui::PAGE_TRANSITION_LINK, |
1738 FrameMsg_Navigate_Type::NORMAL, false, false, base::TimeTicks::Now(), | 1738 FrameMsg_Navigate_Type::NORMAL, false, false, base::TimeTicks::Now(), |
1739 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL()); | 1739 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL(), |
1740 LOFI_UNSPECIFIED); | |
nasko
2015/10/15 16:54:43
This should always be specified as OFF. Why would
megjablon
2015/10/19 22:13:49
Done.
| |
1740 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 1741 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
1741 switches::kEnableBrowserSideNavigation)) { | 1742 switches::kEnableBrowserSideNavigation)) { |
1742 CommitNavigation(nullptr, nullptr, common_params, | 1743 CommitNavigation(nullptr, nullptr, common_params, |
1743 RequestNavigationParams()); | 1744 RequestNavigationParams()); |
1744 } else { | 1745 } else { |
1745 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); | 1746 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); |
1746 } | 1747 } |
1747 } | 1748 } |
1748 | 1749 |
1749 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, | 1750 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, |
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2267 BrowserPluginInstanceIDToAXTreeID(value))); | 2268 BrowserPluginInstanceIDToAXTreeID(value))); |
2268 break; | 2269 break; |
2269 case AX_CONTENT_INT_ATTRIBUTE_LAST: | 2270 case AX_CONTENT_INT_ATTRIBUTE_LAST: |
2270 NOTREACHED(); | 2271 NOTREACHED(); |
2271 break; | 2272 break; |
2272 } | 2273 } |
2273 } | 2274 } |
2274 } | 2275 } |
2275 | 2276 |
2276 } // namespace content | 2277 } // namespace content |
OLD | NEW |