Chromium Code Reviews| Index: content/common/navigation_params.cc |
| diff --git a/content/common/navigation_params.cc b/content/common/navigation_params.cc |
| index 4171937ca59dcc526890a82e15faf1e981617452..5bd8fd5e3fdcad2efb9d9008e680968c7ae545c6 100644 |
| --- a/content/common/navigation_params.cc |
| +++ b/content/common/navigation_params.cc |
| @@ -7,6 +7,14 @@ |
| #include "base/memory/ref_counted_memory.h" |
| namespace content { |
| + |
| +bool ShouldMakeNetworkRequestForNavigation(const GURL& url) { |
| + // Data urls should not make network requests. |
| + if (url.SchemeIs(url::kDataScheme)) |
| + return false; |
| + return true; |
|
carlosk
2015/02/17 12:35:09
Suggestion: return !url.SchemeIs(url::kDataScheme)
clamy
2015/02/20 17:05:59
Done.
|
| +} |
| + |
| CommonNavigationParams::CommonNavigationParams() |
| : transition(ui::PAGE_TRANSITION_LINK), |
| navigation_type(FrameMsg_Navigate_Type::NORMAL), |
| @@ -21,14 +29,18 @@ CommonNavigationParams::CommonNavigationParams( |
| FrameMsg_Navigate_Type::Value navigation_type, |
| bool allow_download, |
| base::TimeTicks ui_timestamp, |
| - FrameMsg_UILoadMetricsReportType::Value report_type) |
| + FrameMsg_UILoadMetricsReportType::Value report_type, |
| + const GURL& base_url_for_data_url, |
| + const GURL& history_url_for_data_url) |
| : url(url), |
| referrer(referrer), |
| transition(transition), |
| navigation_type(navigation_type), |
| allow_download(allow_download), |
| ui_timestamp(ui_timestamp), |
| - report_type(report_type) { |
| + report_type(report_type), |
| + base_url_for_data_url(base_url_for_data_url), |
| + history_url_for_data_url(history_url_for_data_url) { |
| } |
| CommonNavigationParams::~CommonNavigationParams() { |