| OLD | NEW |
| 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 Loading... |
| 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(), request, callback, new_url); | 38 browser_context_, extension_info_map_.get(), nullptr, request, callback, |
| 39 new_url); |
| 39 } | 40 } |
| 40 | 41 |
| 41 int ShellNetworkDelegate::OnBeforeStartTransaction( | 42 int ShellNetworkDelegate::OnBeforeStartTransaction( |
| 42 net::URLRequest* request, | 43 net::URLRequest* request, |
| 43 const net::CompletionCallback& callback, | 44 const net::CompletionCallback& callback, |
| 44 net::HttpRequestHeaders* headers) { | 45 net::HttpRequestHeaders* headers) { |
| 45 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( | 46 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( |
| 46 browser_context_, extension_info_map_.get(), request, callback, headers); | 47 browser_context_, extension_info_map_.get(), nullptr, request, callback, |
| 48 headers); |
| 47 } | 49 } |
| 48 | 50 |
| 49 void ShellNetworkDelegate::OnStartTransaction( | 51 void ShellNetworkDelegate::OnStartTransaction( |
| 50 net::URLRequest* request, | 52 net::URLRequest* request, |
| 51 const net::HttpRequestHeaders& headers) { | 53 const net::HttpRequestHeaders& headers) { |
| 52 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders( | 54 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders( |
| 53 browser_context_, extension_info_map_.get(), request, headers); | 55 browser_context_, extension_info_map_.get(), nullptr, request, headers); |
| 54 } | 56 } |
| 55 | 57 |
| 56 int ShellNetworkDelegate::OnHeadersReceived( | 58 int ShellNetworkDelegate::OnHeadersReceived( |
| 57 net::URLRequest* request, | 59 net::URLRequest* request, |
| 58 const net::CompletionCallback& callback, | 60 const net::CompletionCallback& callback, |
| 59 const net::HttpResponseHeaders* original_response_headers, | 61 const net::HttpResponseHeaders* original_response_headers, |
| 60 scoped_refptr<net::HttpResponseHeaders>* override_response_headers, | 62 scoped_refptr<net::HttpResponseHeaders>* override_response_headers, |
| 61 GURL* allowed_unsafe_redirect_url) { | 63 GURL* allowed_unsafe_redirect_url) { |
| 62 return ExtensionWebRequestEventRouter::GetInstance()->OnHeadersReceived( | 64 return ExtensionWebRequestEventRouter::GetInstance()->OnHeadersReceived( |
| 63 browser_context_, | 65 browser_context_, extension_info_map_.get(), nullptr, request, callback, |
| 64 extension_info_map_.get(), | 66 original_response_headers, override_response_headers, |
| 65 request, | |
| 66 callback, | |
| 67 original_response_headers, | |
| 68 override_response_headers, | |
| 69 allowed_unsafe_redirect_url); | 67 allowed_unsafe_redirect_url); |
| 70 } | 68 } |
| 71 | 69 |
| 72 void ShellNetworkDelegate::OnBeforeRedirect( | 70 void ShellNetworkDelegate::OnBeforeRedirect( |
| 73 net::URLRequest* request, | 71 net::URLRequest* request, |
| 74 const GURL& new_location) { | 72 const GURL& new_location) { |
| 75 ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRedirect( | 73 ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRedirect( |
| 76 browser_context_, extension_info_map_.get(), request, new_location); | 74 browser_context_, extension_info_map_.get(), nullptr, request, |
| 75 new_location); |
| 77 } | 76 } |
| 78 | 77 |
| 79 void ShellNetworkDelegate::OnResponseStarted(net::URLRequest* request, | 78 void ShellNetworkDelegate::OnResponseStarted(net::URLRequest* request, |
| 80 int net_error) { | 79 int net_error) { |
| 81 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted( | 80 ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted( |
| 82 browser_context_, extension_info_map_.get(), request, net_error); | 81 browser_context_, extension_info_map_.get(), nullptr, request, net_error); |
| 83 } | 82 } |
| 84 | 83 |
| 85 void ShellNetworkDelegate::OnCompleted(net::URLRequest* request, | 84 void ShellNetworkDelegate::OnCompleted(net::URLRequest* request, |
| 86 bool started, | 85 bool started, |
| 87 int net_error) { | 86 int net_error) { |
| 88 DCHECK_NE(net::ERR_IO_PENDING, net_error); | 87 DCHECK_NE(net::ERR_IO_PENDING, net_error); |
| 89 | 88 |
| 90 if (net_error == net::OK) { | 89 if (net_error == net::OK) { |
| 91 bool is_redirect = request->response_headers() && | 90 bool is_redirect = request->response_headers() && |
| 92 net::HttpResponseHeaders::IsRedirectResponseCode( | 91 net::HttpResponseHeaders::IsRedirectResponseCode( |
| 93 request->response_headers()->response_code()); | 92 request->response_headers()->response_code()); |
| 94 if (!is_redirect) { | 93 if (!is_redirect) { |
| 95 ExtensionWebRequestEventRouter::GetInstance()->OnCompleted( | 94 ExtensionWebRequestEventRouter::GetInstance()->OnCompleted( |
| 96 browser_context_, extension_info_map_.get(), request, net_error); | 95 browser_context_, extension_info_map_.get(), nullptr, request, |
| 96 net_error); |
| 97 } | 97 } |
| 98 } else { | 98 } else { |
| 99 ExtensionWebRequestEventRouter::GetInstance()->OnErrorOccurred( | 99 ExtensionWebRequestEventRouter::GetInstance()->OnErrorOccurred( |
| 100 browser_context_, extension_info_map_.get(), request, started, | 100 browser_context_, extension_info_map_.get(), nullptr, request, started, |
| 101 net_error); | 101 net_error); |
| 102 } | 102 } |
| 103 } | 103 } |
| 104 | 104 |
| 105 void ShellNetworkDelegate::OnURLRequestDestroyed( | 105 void ShellNetworkDelegate::OnURLRequestDestroyed( |
| 106 net::URLRequest* request) { | 106 net::URLRequest* request) { |
| 107 ExtensionWebRequestEventRouter::GetInstance()->OnURLRequestDestroyed( | 107 ExtensionWebRequestEventRouter::GetInstance()->OnURLRequestDestroyed( |
| 108 browser_context_, request); | 108 browser_context_, request); |
| 109 } | 109 } |
| 110 | 110 |
| 111 void ShellNetworkDelegate::OnPACScriptError( | 111 void ShellNetworkDelegate::OnPACScriptError( |
| 112 int line_number, | 112 int line_number, |
| 113 const base::string16& error) { | 113 const base::string16& error) { |
| 114 } | 114 } |
| 115 | 115 |
| 116 net::NetworkDelegate::AuthRequiredResponse | 116 net::NetworkDelegate::AuthRequiredResponse |
| 117 ShellNetworkDelegate::OnAuthRequired( | 117 ShellNetworkDelegate::OnAuthRequired( |
| 118 net::URLRequest* request, | 118 net::URLRequest* request, |
| 119 const net::AuthChallengeInfo& auth_info, | 119 const net::AuthChallengeInfo& auth_info, |
| 120 const AuthCallback& callback, | 120 const AuthCallback& callback, |
| 121 net::AuthCredentials* credentials) { | 121 net::AuthCredentials* credentials) { |
| 122 return ExtensionWebRequestEventRouter::GetInstance()->OnAuthRequired( | 122 return ExtensionWebRequestEventRouter::GetInstance()->OnAuthRequired( |
| 123 browser_context_, extension_info_map_.get(), request, auth_info, callback, | 123 browser_context_, extension_info_map_.get(), nullptr, request, auth_info, |
| 124 credentials); | 124 callback, credentials); |
| 125 } | 125 } |
| 126 | 126 |
| 127 } // namespace extensions | 127 } // namespace extensions |
| OLD | NEW |