Service Worker: (Re-commit) Add FetchEvent.clientId

content/common/service_worker/service_worker_types.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_
 #define CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 108 matching lines @@
 struct CONTENT_EXPORT ServiceWorkerFetchRequest {
   ServiceWorkerFetchRequest();
   ServiceWorkerFetchRequest(const GURL& url,
                             const std::string& method,
                             const ServiceWorkerHeaderMap& headers,
                             const Referrer& referrer,
                             bool is_reload);
   ~ServiceWorkerFetchRequest();
 
   FetchRequestMode mode;
+  bool is_main_resource_load;
   RequestContextType request_context_type;
   RequestContextFrameType frame_type;
   GURL url;
   std::string method;
   ServiceWorkerHeaderMap headers;
   std::string blob_uuid;
   uint64_t blob_size;
   Referrer referrer;
   FetchCredentialsMode credentials_mode;
   FetchRedirectMode redirect_mode;
+  std::string client_id;
   bool is_reload;
 };
 
 // Represents a response to a fetch.
 struct CONTENT_EXPORT ServiceWorkerResponse {
   ServiceWorkerResponse();
   ServiceWorkerResponse(const GURL& url,
                         int status_code,
                         const std::string& status_text,
                         blink::WebServiceWorkerResponseType response_type,
@@ skipping 63 matching lines @@
 
 struct ServiceWorkerClientQueryOptions {
   ServiceWorkerClientQueryOptions();
   blink::WebServiceWorkerClientType client_type;
   bool include_uncontrolled;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_