Index: content/common/navigation_params.h |
diff --git a/content/common/navigation_params.h b/content/common/navigation_params.h |
index 37b1af035401ee8e9ab394831888b68c6519e4e9..0dec772c265a8861e73b40f91698e6a2393be1cf 100644 |
--- a/content/common/navigation_params.h |
+++ b/content/common/navigation_params.h |
@@ -11,8 +11,11 @@ |
#include "base/time/time.h" |
#include "content/common/content_export.h" |
#include "content/common/frame_message_enums.h" |
+#include "content/common/service_worker/service_worker_types.h" |
clamy
2015/08/31 12:09:27
nit; remove unnecessary include.
Fabrice (no longer in Chrome)
2015/08/31 14:00:35
Done.
|
#include "content/public/common/page_state.h" |
#include "content/public/common/referrer.h" |
+#include "content/public/common/request_context_frame_type.h" |
clamy
2015/08/31 12:09:27
nit: remove unnecessary include.
Fabrice (no longer in Chrome)
2015/08/31 14:00:35
Done.
|
+#include "content/public/common/request_context_type.h" |
#include "ui/base/page_transition_types.h" |
#include "url/gurl.h" |
@@ -46,7 +49,8 @@ struct CONTENT_EXPORT 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); |
~CommonNavigationParams(); |
// The URL to navigate to. |
@@ -89,6 +93,10 @@ struct CONTENT_EXPORT CommonNavigationParams { |
// History URL for use in Blink's SubstituteData. |
// Is only used with data: URLs. |
GURL history_url_for_data_url; |
+ |
+ // PlzNavigate |
+ // The ServiceWorker provider ID associated with the navigation. |
+ int service_worker_provider_id; |
}; |
// Provided by the renderer ---------------------------------------------------- |
@@ -107,7 +115,9 @@ struct CONTENT_EXPORT BeginNavigationParams { |
BeginNavigationParams(std::string method, |
std::string headers, |
int load_flags, |
- bool has_user_gesture); |
+ bool has_user_gesture, |
+ bool skip_service_worker, |
+ RequestContextType request_context_type); |
// The request method: GET, POST, etc. |
std::string method; |
@@ -120,6 +130,12 @@ struct CONTENT_EXPORT BeginNavigationParams { |
// True if the request was user initiated. |
bool has_user_gesture; |
+ |
+ // True if the ServiceWorker should be skipped. |
+ bool skip_service_worker; |
+ |
+ // Indicates the request context type. |
+ RequestContextType request_context_type; |
}; |
// Provided by the browser ----------------------------------------------------- |