| Index: content/common/navigation_params.cc
|
| diff --git a/content/common/navigation_params.cc b/content/common/navigation_params.cc
|
| index 5c5dfc778fe5c9be0097c21c204f815da8960176..75473606b894c8ab7076a4c461ed675ca20c2808 100644
|
| --- a/content/common/navigation_params.cc
|
| +++ b/content/common/navigation_params.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/memory/ref_counted_memory.h"
|
| +#include "content/common/service_worker/service_worker_types.h"
|
| #include "content/public/common/content_switches.h"
|
|
|
| namespace content {
|
| @@ -28,7 +29,8 @@ CommonNavigationParams::CommonNavigationParams()
|
| navigation_type(FrameMsg_Navigate_Type::NORMAL),
|
| allow_download(true),
|
| should_replace_current_entry(false),
|
| - report_type(FrameMsg_UILoadMetricsReportType::NO_REPORT) {
|
| + report_type(FrameMsg_UILoadMetricsReportType::NO_REPORT),
|
| + service_worker_provider_id(kInvalidServiceWorkerProviderId) {
|
| }
|
|
|
| CommonNavigationParams::CommonNavigationParams(
|
| @@ -41,7 +43,8 @@ CommonNavigationParams::CommonNavigationParams(
|
| base::TimeTicks ui_timestamp,
|
| FrameMsg_UILoadMetricsReportType::Value report_type,
|
| const GURL& base_url_for_data_url,
|
| - const GURL& history_url_for_data_url)
|
| + const GURL& history_url_for_data_url,
|
| + int service_worker_provider_id)
|
| : url(url),
|
| referrer(referrer),
|
| transition(transition),
|
| @@ -51,24 +54,33 @@ CommonNavigationParams::CommonNavigationParams(
|
| ui_timestamp(ui_timestamp),
|
| report_type(report_type),
|
| base_url_for_data_url(base_url_for_data_url),
|
| - history_url_for_data_url(history_url_for_data_url) {
|
| + history_url_for_data_url(history_url_for_data_url),
|
| + service_worker_provider_id(service_worker_provider_id) {
|
| }
|
|
|
| CommonNavigationParams::~CommonNavigationParams() {
|
| }
|
|
|
| BeginNavigationParams::BeginNavigationParams()
|
| - : load_flags(0), has_user_gesture(false) {
|
| + : load_flags(0),
|
| + has_user_gesture(false),
|
| + skip_service_worker(false),
|
| + request_context_type(REQUEST_CONTEXT_TYPE_HYPERLINK) {
|
| }
|
|
|
| -BeginNavigationParams::BeginNavigationParams(std::string method,
|
| - std::string headers,
|
| - int load_flags,
|
| - bool has_user_gesture)
|
| +BeginNavigationParams::BeginNavigationParams(
|
| + std::string method,
|
| + std::string headers,
|
| + int load_flags,
|
| + bool has_user_gesture,
|
| + bool skip_service_worker,
|
| + RequestContextType request_context_type)
|
| : method(method),
|
| headers(headers),
|
| load_flags(load_flags),
|
| - has_user_gesture(has_user_gesture) {
|
| + has_user_gesture(has_user_gesture),
|
| + skip_service_worker(skip_service_worker),
|
| + request_context_type(request_context_type) {
|
| }
|
|
|
| StartNavigationParams::StartNavigationParams()
|
|
|