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

Side by Side Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 8743019: base::Bind: Convert net::NetworkDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fixes. Created 9 years 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/net/chrome_network_delegate.h ('k') | net/base/network_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/net/chrome_network_delegate.h" 5 #include "chrome/browser/net/chrome_network_delegate.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 8 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
9 #include "chrome/browser/extensions/extension_event_router_forwarder.h" 9 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
10 #include "chrome/browser/extensions/extension_info_map.h" 10 #include "chrome/browser/extensions/extension_info_map.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 void ChromeNetworkDelegate::InitializeReferrersEnabled( 68 void ChromeNetworkDelegate::InitializeReferrersEnabled(
69 BooleanPrefMember* enable_referrers, 69 BooleanPrefMember* enable_referrers,
70 PrefService* pref_service) { 70 PrefService* pref_service) {
71 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 71 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
72 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); 72 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL);
73 enable_referrers->MoveToThread(BrowserThread::IO); 73 enable_referrers->MoveToThread(BrowserThread::IO);
74 } 74 }
75 75
76 int ChromeNetworkDelegate::OnBeforeURLRequest( 76 int ChromeNetworkDelegate::OnBeforeURLRequest(
77 net::URLRequest* request, 77 net::URLRequest* request,
78 net::OldCompletionCallback* callback, 78 const net::CompletionCallback& callback,
79 GURL* new_url) { 79 GURL* new_url) {
80 #if defined(ENABLE_CONFIGURATION_POLICY) 80 #if defined(ENABLE_CONFIGURATION_POLICY)
81 // TODO(joaodasilva): This prevents extensions from seeing URLs that are 81 // TODO(joaodasilva): This prevents extensions from seeing URLs that are
82 // blocked. However, an extension might redirect the request to another URL, 82 // blocked. However, an extension might redirect the request to another URL,
83 // which is not blocked. 83 // which is not blocked.
84 if (url_blacklist_manager_ && 84 if (url_blacklist_manager_ &&
85 url_blacklist_manager_->IsURLBlocked(request->url())) { 85 url_blacklist_manager_->IsURLBlocked(request->url())) {
86 // URL access blocked by policy. 86 // URL access blocked by policy.
87 scoped_refptr<net::NetLog::EventParameters> params; 87 scoped_refptr<net::NetLog::EventParameters> params;
88 params = new net::NetLogStringParameter("url", request->url().spec()); 88 params = new net::NetLogStringParameter("url", request->url().spec());
89 request->net_log().AddEvent( 89 request->net_log().AddEvent(
90 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST, params); 90 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST, params);
91 return net::ERR_NETWORK_ACCESS_DENIED; 91 return net::ERR_NETWORK_ACCESS_DENIED;
92 } 92 }
93 #endif 93 #endif
94 94
95 if (!enable_referrers_->GetValue()) 95 if (!enable_referrers_->GetValue())
96 request->set_referrer(std::string()); 96 request->set_referrer(std::string());
97 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( 97 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
98 profile_, extension_info_map_.get(), request, callback, new_url); 98 profile_, extension_info_map_.get(), request, callback, new_url);
99 } 99 }
100 100
101 int ChromeNetworkDelegate::OnBeforeSendHeaders( 101 int ChromeNetworkDelegate::OnBeforeSendHeaders(
102 net::URLRequest* request, 102 net::URLRequest* request,
103 net::OldCompletionCallback* callback, 103 const net::CompletionCallback& callback,
104 net::HttpRequestHeaders* headers) { 104 net::HttpRequestHeaders* headers) {
105 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( 105 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders(
106 profile_, extension_info_map_.get(), request, callback, headers); 106 profile_, extension_info_map_.get(), request, callback, headers);
107 } 107 }
108 108
109 void ChromeNetworkDelegate::OnSendHeaders( 109 void ChromeNetworkDelegate::OnSendHeaders(
110 net::URLRequest* request, 110 net::URLRequest* request,
111 const net::HttpRequestHeaders& headers) { 111 const net::HttpRequestHeaders& headers) {
112 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders( 112 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders(
113 profile_, extension_info_map_.get(), request, headers); 113 profile_, extension_info_map_.get(), request, headers);
114 } 114 }
115 115
116 int ChromeNetworkDelegate::OnHeadersReceived( 116 int ChromeNetworkDelegate::OnHeadersReceived(
117 net::URLRequest* request, 117 net::URLRequest* request,
118 net::OldCompletionCallback* callback, 118 const net::CompletionCallback& callback,
119 net::HttpResponseHeaders* original_response_headers, 119 net::HttpResponseHeaders* original_response_headers,
120 scoped_refptr<net::HttpResponseHeaders>* override_response_headers) { 120 scoped_refptr<net::HttpResponseHeaders>* override_response_headers) {
121 return ExtensionWebRequestEventRouter::GetInstance()->OnHeadersReceived( 121 return ExtensionWebRequestEventRouter::GetInstance()->OnHeadersReceived(
122 profile_, extension_info_map_.get(), request, callback, 122 profile_, extension_info_map_.get(), request, callback,
123 original_response_headers, override_response_headers); 123 original_response_headers, override_response_headers);
124 } 124 }
125 125
126 void ChromeNetworkDelegate::OnBeforeRedirect(net::URLRequest* request, 126 void ChromeNetworkDelegate::OnBeforeRedirect(net::URLRequest* request,
127 const GURL& new_location) { 127 const GURL& new_location) {
128 ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRedirect( 128 ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRedirect(
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 net::NetworkDelegate::AuthRequiredResponse 175 net::NetworkDelegate::AuthRequiredResponse
176 ChromeNetworkDelegate::OnAuthRequired( 176 ChromeNetworkDelegate::OnAuthRequired(
177 net::URLRequest* request, 177 net::URLRequest* request,
178 const net::AuthChallengeInfo& auth_info, 178 const net::AuthChallengeInfo& auth_info,
179 const AuthCallback& callback, 179 const AuthCallback& callback,
180 net::AuthCredentials* credentials) { 180 net::AuthCredentials* credentials) {
181 return ExtensionWebRequestEventRouter::GetInstance()->OnAuthRequired( 181 return ExtensionWebRequestEventRouter::GetInstance()->OnAuthRequired(
182 profile_, extension_info_map_.get(), request, auth_info, 182 profile_, extension_info_map_.get(), request, auth_info,
183 callback, credentials); 183 callback, credentials);
184 } 184 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_network_delegate.h ('k') | net/base/network_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698