OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/common/navigation_params.h" | 5 #include "content/common/navigation_params.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "content/common/service_worker/service_worker_types.h" | 9 #include "content/common/service_worker/service_worker_types.h" |
10 #include "content/public/common/appcache_info.h" | 10 #include "content/public/common/appcache_info.h" |
11 #include "content/public/common/browser_side_navigation_policy.h" | 11 #include "content/public/common/browser_side_navigation_policy.h" |
12 #include "content/public/common/url_constants.h" | 12 #include "content/public/common/url_constants.h" |
13 #include "url/gurl.h" | 13 #include "url/gurl.h" |
14 #include "url/url_constants.h" | 14 #include "url/url_constants.h" |
| 15 #include "url/url_util.h" |
15 | 16 |
16 namespace content { | 17 namespace content { |
17 | 18 |
18 // PlzNavigate | 19 // PlzNavigate |
19 bool ShouldMakeNetworkRequestForURL(const GURL& url) { | 20 bool ShouldMakeNetworkRequestForURL(const GURL& url) { |
20 CHECK(IsBrowserSideNavigationEnabled()); | 21 CHECK(IsBrowserSideNavigationEnabled()); |
21 | 22 |
22 // Javascript URLs, about:blank, srcdoc should not send a request | 23 // Javascript URLs, about:blank, srcdoc should not send a request |
23 // to the network stack. | 24 // to the network stack. |
24 // TODO(clamy): same document navigations should not send requests to the | 25 // TODO(clamy): same document navigations should not send requests to the |
25 // network stack. Neither should pushState/popState. | 26 // network stack. Neither should pushState/popState. |
26 return url != url::kAboutBlankURL && !url.SchemeIs(url::kJavaScriptScheme) && | 27 return !url::IsAboutBlank(url) && !url.SchemeIs(url::kJavaScriptScheme) && |
27 !url.is_empty() && !url.SchemeIs(url::kContentIDScheme) && | 28 !url.is_empty() && !url.SchemeIs(url::kContentIDScheme) && |
28 url != content::kAboutSrcDocURL; | 29 url != content::kAboutSrcDocURL; |
29 } | 30 } |
30 | 31 |
31 CommonNavigationParams::CommonNavigationParams() | 32 CommonNavigationParams::CommonNavigationParams() |
32 : transition(ui::PAGE_TRANSITION_LINK), | 33 : transition(ui::PAGE_TRANSITION_LINK), |
33 navigation_type(FrameMsg_Navigate_Type::NORMAL), | 34 navigation_type(FrameMsg_Navigate_Type::NORMAL), |
34 allow_download(true), | 35 allow_download(true), |
35 should_replace_current_entry(false), | 36 should_replace_current_entry(false), |
36 report_type(FrameMsg_UILoadMetricsReportType::NO_REPORT), | 37 report_type(FrameMsg_UILoadMetricsReportType::NO_REPORT), |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 const RequestNavigationParams& request_params) | 199 const RequestNavigationParams& request_params) |
199 : common_params(common_params), | 200 : common_params(common_params), |
200 start_params(start_params), | 201 start_params(start_params), |
201 request_params(request_params) { | 202 request_params(request_params) { |
202 } | 203 } |
203 | 204 |
204 NavigationParams::~NavigationParams() { | 205 NavigationParams::~NavigationParams() { |
205 } | 206 } |
206 | 207 |
207 } // namespace content | 208 } // namespace content |
OLD | NEW |