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

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

Issue 10640019: Remove the HANDLED_EXTERNALLY status code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: hack, hack, hack Created 8 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/content_settings/cookie_settings.h" 9 #include "chrome/browser/content_settings/cookie_settings.h"
10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 225
226 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request, 226 void ChromeNetworkDelegate::OnRawBytesRead(const net::URLRequest& request,
227 int bytes_read) { 227 int bytes_read) {
228 #if defined(ENABLE_TASK_MANAGER) 228 #if defined(ENABLE_TASK_MANAGER)
229 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read); 229 TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read);
230 #endif // defined(ENABLE_TASK_MANAGER) 230 #endif // defined(ENABLE_TASK_MANAGER)
231 } 231 }
232 232
233 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request, 233 void ChromeNetworkDelegate::OnCompleted(net::URLRequest* request,
234 bool started) { 234 bool started) {
235 const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
235 if (request->status().status() == net::URLRequestStatus::SUCCESS || 236 if (request->status().status() == net::URLRequestStatus::SUCCESS ||
236 request->status().status() == net::URLRequestStatus::HANDLED_EXTERNALLY) { 237 (info && info->GetHandledExternally())) {
237 bool is_redirect = request->response_headers() && 238 bool is_redirect = request->response_headers() &&
238 net::HttpResponseHeaders::IsRedirectResponseCode( 239 net::HttpResponseHeaders::IsRedirectResponseCode(
239 request->response_headers()->response_code()); 240 request->response_headers()->response_code());
240 if (!is_redirect) { 241 if (!is_redirect) {
241 ExtensionWebRequestEventRouter::GetInstance()->OnCompleted( 242 ExtensionWebRequestEventRouter::GetInstance()->OnCompleted(
242 profile_, extension_info_map_.get(), request); 243 profile_, extension_info_map_.get(), request);
243 } 244 }
244 } else if (request->status().status() == net::URLRequestStatus::FAILED || 245 } else if (request->status().status() == net::URLRequestStatus::FAILED ||
245 request->status().status() == net::URLRequestStatus::CANCELED) { 246 request->status().status() == net::URLRequestStatus::CANCELED) {
246 ExtensionWebRequestEventRouter::GetInstance()->OnErrorOccurred( 247 ExtensionWebRequestEventRouter::GetInstance()->OnErrorOccurred(
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 // URL access blocked by policy. 382 // URL access blocked by policy.
382 socket->net_log()->AddEvent( 383 socket->net_log()->AddEvent(
383 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST, 384 net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST,
384 net::NetLog::StringCallback("url", 385 net::NetLog::StringCallback("url",
385 &socket->url().possibly_invalid_spec())); 386 &socket->url().possibly_invalid_spec()));
386 return net::ERR_NETWORK_ACCESS_DENIED; 387 return net::ERR_NETWORK_ACCESS_DENIED;
387 } 388 }
388 #endif 389 #endif
389 return net::OK; 390 return net::OK;
390 } 391 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698