Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Side by Side Diff: extensions/browser/api/web_request/web_request_event_details.cc

Issue 2700553002: Introduce WebRequestResourceType. (Closed)
Patch Set: Fix fix win build. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/api/web_request/web_request_event_details.h" 5 #include "extensions/browser/api/web_request/web_request_event_details.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "content/public/browser/render_frame_host.h" 10 #include "content/public/browser/render_frame_host.h"
11 #include "content/public/browser/resource_request_info.h" 11 #include "content/public/browser/resource_request_info.h"
12 #include "content/public/common/child_process_host.h" 12 #include "content/public/common/child_process_host.h"
13 #include "extensions/browser/api/web_request/upload_data_presenter.h" 13 #include "extensions/browser/api/web_request/upload_data_presenter.h"
14 #include "extensions/browser/api/web_request/web_request_api_constants.h" 14 #include "extensions/browser/api/web_request/web_request_api_constants.h"
15 #include "extensions/browser/api/web_request/web_request_api_helpers.h" 15 #include "extensions/browser/api/web_request/web_request_api_helpers.h"
16 #include "extensions/browser/api/web_request/web_request_resource_type.h"
16 #include "ipc/ipc_message.h" 17 #include "ipc/ipc_message.h"
17 #include "net/base/auth.h" 18 #include "net/base/auth.h"
18 #include "net/base/upload_data_stream.h" 19 #include "net/base/upload_data_stream.h"
19 #include "net/http/http_request_headers.h" 20 #include "net/http/http_request_headers.h"
20 #include "net/http/http_response_headers.h" 21 #include "net/http/http_response_headers.h"
21 #include "net/url_request/url_request.h" 22 #include "net/url_request/url_request.h"
22 23
23 using extension_web_request_api_helpers::ExtraInfoSpec; 24 using extension_web_request_api_helpers::ExtraInfoSpec;
24 25
25 namespace helpers = extension_web_request_api_helpers; 26 namespace helpers = extension_web_request_api_helpers;
26 namespace keys = extension_web_request_api_constants; 27 namespace keys = extension_web_request_api_constants;
27 28
28 namespace extensions { 29 namespace extensions {
29 30
30 WebRequestEventDetails::WebRequestEventDetails(const net::URLRequest* request, 31 WebRequestEventDetails::WebRequestEventDetails(const net::URLRequest* request,
31 int extra_info_spec) 32 int extra_info_spec)
32 : extra_info_spec_(extra_info_spec), 33 : extra_info_spec_(extra_info_spec),
33 render_process_id_(content::ChildProcessHost::kInvalidUniqueID), 34 render_process_id_(content::ChildProcessHost::kInvalidUniqueID),
34 render_frame_id_(MSG_ROUTING_NONE) { 35 render_frame_id_(MSG_ROUTING_NONE) {
35 content::ResourceType resource_type = content::RESOURCE_TYPE_LAST_TYPE; 36 auto resource_type = WebRequestResourceType::LAST_TYPE;
36 const content::ResourceRequestInfo* info = 37 const content::ResourceRequestInfo* info =
37 content::ResourceRequestInfo::ForRequest(request); 38 content::ResourceRequestInfo::ForRequest(request);
38 if (info) { 39 if (info) {
39 render_process_id_ = info->GetChildID(); 40 render_process_id_ = info->GetChildID();
40 render_frame_id_ = info->GetRenderFrameID(); 41 render_frame_id_ = info->GetRenderFrameID();
41 resource_type = info->GetResourceType(); 42 resource_type = ToWebRequestResourceType(info->GetResourceType());
42 } else { 43 } else {
43 // Fallback for requests that are not allocated by a ResourceDispatcherHost, 44 // Fallback for requests that are not allocated by a ResourceDispatcherHost,
44 // such as the TemplateURLFetcher. 45 // such as the TemplateURLFetcher.
45 content::ResourceRequestInfo::GetRenderFrameForRequest( 46 content::ResourceRequestInfo::GetRenderFrameForRequest(
46 request, &render_process_id_, &render_frame_id_); 47 request, &render_process_id_, &render_frame_id_);
47 } 48 }
48 49
49 dict_.SetString(keys::kMethodKey, request->method()); 50 dict_.SetString(keys::kMethodKey, request->method());
50 dict_.SetString(keys::kRequestIdKey, 51 dict_.SetString(keys::kRequestIdKey,
51 base::Uint64ToString(request->identifier())); 52 base::Uint64ToString(request->identifier()));
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 231
231 void WebRequestEventDetails::OnDeterminedFrameData( 232 void WebRequestEventDetails::OnDeterminedFrameData(
232 std::unique_ptr<WebRequestEventDetails> self, 233 std::unique_ptr<WebRequestEventDetails> self,
233 const DeterminedFrameDataCallback& callback, 234 const DeterminedFrameDataCallback& callback,
234 const ExtensionApiFrameIdMap::FrameData& frame_data) { 235 const ExtensionApiFrameIdMap::FrameData& frame_data) {
235 SetFrameData(frame_data); 236 SetFrameData(frame_data);
236 callback.Run(std::move(self)); 237 callback.Run(std::move(self));
237 } 238 }
238 239
239 } // namespace extensions 240 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698