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

Side by Side Diff: extensions/shell/browser/shell_network_delegate.cc

Issue 2432153003: Make sure the default CSP is used for <webview> with PlzNavigate. (Closed)
Patch Set: add comment Created 4 years, 2 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
« no previous file with comments | « extensions/browser/url_request_util.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/shell/browser/shell_network_delegate.h" 5 #include "extensions/shell/browser/shell_network_delegate.h"
6 6
7 #include "content/public/browser/render_frame_host.h" 7 #include "content/public/browser/render_frame_host.h"
8 #include "content/public/browser/resource_request_info.h" 8 #include "content/public/browser/resource_request_info.h"
9 #include "extensions/browser/api/web_request/web_request_api.h" 9 #include "extensions/browser/api/web_request/web_request_api.h"
10 #include "extensions/browser/extension_system.h" 10 #include "extensions/browser/extension_system.h"
(...skipping 17 matching lines...) Expand all
28 28
29 void ShellNetworkDelegate::SetAcceptAllCookies(bool accept) { 29 void ShellNetworkDelegate::SetAcceptAllCookies(bool accept) {
30 g_accept_all_cookies = accept; 30 g_accept_all_cookies = accept;
31 } 31 }
32 32
33 int ShellNetworkDelegate::OnBeforeURLRequest( 33 int ShellNetworkDelegate::OnBeforeURLRequest(
34 net::URLRequest* request, 34 net::URLRequest* request,
35 const net::CompletionCallback& callback, 35 const net::CompletionCallback& callback,
36 GURL* new_url) { 36 GURL* new_url) {
37 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( 37 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
38 browser_context_, extension_info_map_.get(), nullptr, request, callback, 38 browser_context_, extension_info_map_.get(), request, callback, new_url);
39 new_url);
40 } 39 }
41 40
42 int ShellNetworkDelegate::OnBeforeStartTransaction( 41 int ShellNetworkDelegate::OnBeforeStartTransaction(
43 net::URLRequest* request, 42 net::URLRequest* request,
44 const net::CompletionCallback& callback, 43 const net::CompletionCallback& callback,
45 net::HttpRequestHeaders* headers) { 44 net::HttpRequestHeaders* headers) {
46 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( 45 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders(
47 browser_context_, extension_info_map_.get(), nullptr, request, callback, 46 browser_context_, extension_info_map_.get(), request, callback, headers);
48 headers);
49 } 47 }
50 48
51 void ShellNetworkDelegate::OnStartTransaction( 49 void ShellNetworkDelegate::OnStartTransaction(
52 net::URLRequest* request, 50 net::URLRequest* request,
53 const net::HttpRequestHeaders& headers) { 51 const net::HttpRequestHeaders& headers) {
54 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders( 52 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders(
55 browser_context_, extension_info_map_.get(), nullptr, request, headers); 53 browser_context_, extension_info_map_.get(), request, headers);
56 } 54 }
57 55
58 int ShellNetworkDelegate::OnHeadersReceived( 56 int ShellNetworkDelegate::OnHeadersReceived(
59 net::URLRequest* request, 57 net::URLRequest* request,
60 const net::CompletionCallback& callback, 58 const net::CompletionCallback& callback,
61 const net::HttpResponseHeaders* original_response_headers, 59 const net::HttpResponseHeaders* original_response_headers,
62 scoped_refptr<net::HttpResponseHeaders>* override_response_headers, 60 scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
63 GURL* allowed_unsafe_redirect_url) { 61 GURL* allowed_unsafe_redirect_url) {
64 return ExtensionWebRequestEventRouter::GetInstance()->OnHeadersReceived( 62 return ExtensionWebRequestEventRouter::GetInstance()->OnHeadersReceived(
65 browser_context_, extension_info_map_.get(), nullptr, request, callback, 63 browser_context_, extension_info_map_.get(), request, callback,
66 original_response_headers, override_response_headers, 64 original_response_headers, override_response_headers,
67 allowed_unsafe_redirect_url); 65 allowed_unsafe_redirect_url);
68 } 66 }
69 67
70 void ShellNetworkDelegate::OnBeforeRedirect( 68 void ShellNetworkDelegate::OnBeforeRedirect(
71 net::URLRequest* request, 69 net::URLRequest* request,
72 const GURL& new_location) { 70 const GURL& new_location) {
73 ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRedirect( 71 ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRedirect(
74 browser_context_, extension_info_map_.get(), nullptr, request, 72 browser_context_, extension_info_map_.get(), request, new_location);
75 new_location);
76 } 73 }
77 74
78 void ShellNetworkDelegate::OnResponseStarted(net::URLRequest* request, 75 void ShellNetworkDelegate::OnResponseStarted(net::URLRequest* request,
79 int net_error) { 76 int net_error) {
80 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted( 77 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted(
81 browser_context_, extension_info_map_.get(), nullptr, request, net_error); 78 browser_context_, extension_info_map_.get(), request, net_error);
82 } 79 }
83 80
84 void ShellNetworkDelegate::OnCompleted(net::URLRequest* request, 81 void ShellNetworkDelegate::OnCompleted(net::URLRequest* request,
85 bool started, 82 bool started,
86 int net_error) { 83 int net_error) {
87 DCHECK_NE(net::ERR_IO_PENDING, net_error); 84 DCHECK_NE(net::ERR_IO_PENDING, net_error);
88 85
89 if (net_error == net::OK) { 86 if (net_error == net::OK) {
90 bool is_redirect = request->response_headers() && 87 bool is_redirect = request->response_headers() &&
91 net::HttpResponseHeaders::IsRedirectResponseCode( 88 net::HttpResponseHeaders::IsRedirectResponseCode(
92 request->response_headers()->response_code()); 89 request->response_headers()->response_code());
93 if (!is_redirect) { 90 if (!is_redirect) {
94 ExtensionWebRequestEventRouter::GetInstance()->OnCompleted( 91 ExtensionWebRequestEventRouter::GetInstance()->OnCompleted(
95 browser_context_, extension_info_map_.get(), nullptr, request, 92 browser_context_, extension_info_map_.get(), request, net_error);
96 net_error);
97 } 93 }
98 } else { 94 } else {
99 ExtensionWebRequestEventRouter::GetInstance()->OnErrorOccurred( 95 ExtensionWebRequestEventRouter::GetInstance()->OnErrorOccurred(
100 browser_context_, extension_info_map_.get(), nullptr, request, started, 96 browser_context_, extension_info_map_.get(), request, started,
101 net_error); 97 net_error);
102 } 98 }
103 } 99 }
104 100
105 void ShellNetworkDelegate::OnURLRequestDestroyed( 101 void ShellNetworkDelegate::OnURLRequestDestroyed(
106 net::URLRequest* request) { 102 net::URLRequest* request) {
107 ExtensionWebRequestEventRouter::GetInstance()->OnURLRequestDestroyed( 103 ExtensionWebRequestEventRouter::GetInstance()->OnURLRequestDestroyed(
108 browser_context_, request); 104 browser_context_, request);
109 } 105 }
110 106
111 void ShellNetworkDelegate::OnPACScriptError( 107 void ShellNetworkDelegate::OnPACScriptError(
112 int line_number, 108 int line_number,
113 const base::string16& error) { 109 const base::string16& error) {
114 } 110 }
115 111
116 net::NetworkDelegate::AuthRequiredResponse 112 net::NetworkDelegate::AuthRequiredResponse
117 ShellNetworkDelegate::OnAuthRequired( 113 ShellNetworkDelegate::OnAuthRequired(
118 net::URLRequest* request, 114 net::URLRequest* request,
119 const net::AuthChallengeInfo& auth_info, 115 const net::AuthChallengeInfo& auth_info,
120 const AuthCallback& callback, 116 const AuthCallback& callback,
121 net::AuthCredentials* credentials) { 117 net::AuthCredentials* credentials) {
122 return ExtensionWebRequestEventRouter::GetInstance()->OnAuthRequired( 118 return ExtensionWebRequestEventRouter::GetInstance()->OnAuthRequired(
123 browser_context_, extension_info_map_.get(), nullptr, request, auth_info, 119 browser_context_, extension_info_map_.get(), request, auth_info, callback,
124 callback, credentials); 120 credentials);
125 } 121 }
126 122
127 } // namespace extensions 123 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/url_request_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698