| Index: content/common/navigation_params.cc
|
| diff --git a/content/common/navigation_params.cc b/content/common/navigation_params.cc
|
| index 5c5dfc778fe5c9be0097c21c204f815da8960176..6c221970a740969c669019b84f9619a03d62bc3a 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 {
|
| @@ -58,17 +59,25 @@ 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()
|
| @@ -115,7 +124,8 @@ RequestNavigationParams::RequestNavigationParams()
|
| pending_history_list_offset(-1),
|
| current_history_list_offset(-1),
|
| current_history_list_length(0),
|
| - should_clear_history_list(false) {
|
| + should_clear_history_list(false),
|
| + service_worker_provider_id(kInvalidServiceWorkerProviderId) {
|
| }
|
|
|
| RequestNavigationParams::RequestNavigationParams(
|
| @@ -133,7 +143,8 @@ RequestNavigationParams::RequestNavigationParams(
|
| int pending_history_list_offset,
|
| int current_history_list_offset,
|
| int current_history_list_length,
|
| - bool should_clear_history_list)
|
| + bool should_clear_history_list,
|
| + int service_worker_provider_id)
|
| : is_overriding_user_agent(is_overriding_user_agent),
|
| browser_navigation_start(navigation_start),
|
| redirects(redirects),
|
| @@ -148,7 +159,8 @@ RequestNavigationParams::RequestNavigationParams(
|
| pending_history_list_offset(pending_history_list_offset),
|
| current_history_list_offset(current_history_list_offset),
|
| current_history_list_length(current_history_list_length),
|
| - should_clear_history_list(should_clear_history_list) {
|
| + should_clear_history_list(should_clear_history_list),
|
| + service_worker_provider_id(service_worker_provider_id) {
|
| }
|
|
|
| RequestNavigationParams::~RequestNavigationParams() {
|
|
|