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

Side by Side Diff: chrome/browser/renderer_host/resource_queue.cc

Issue 5384002: net: Remove typedef net::URLRequest URLRequest; (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 10 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/renderer_host/resource_queue.h" 5 #include "chrome/browser/renderer_host/resource_queue.h"
6 6
7 #include "base/stl_util-inl.h" 7 #include "base/stl_util-inl.h"
8 #include "chrome/browser/browser_thread.h" 8 #include "chrome/browser/browser_thread.h"
9 #include "chrome/browser/renderer_host/global_request_id.h" 9 #include "chrome/browser/renderer_host/global_request_id.h"
10 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" 10 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
(...skipping 19 matching lines...) Expand all
30 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 30 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
31 31
32 shutdown_ = true; 32 shutdown_ = true;
33 for (DelegateSet::iterator i = delegates_.begin(); 33 for (DelegateSet::iterator i = delegates_.begin();
34 i != delegates_.end(); ++i) { 34 i != delegates_.end(); ++i) {
35 (*i)->WillShutdownResourceQueue(); 35 (*i)->WillShutdownResourceQueue();
36 } 36 }
37 } 37 }
38 38
39 void ResourceQueue::AddRequest( 39 void ResourceQueue::AddRequest(
40 URLRequest* request, 40 net::URLRequest* request,
41 const ResourceDispatcherHostRequestInfo& request_info) { 41 const ResourceDispatcherHostRequestInfo& request_info) {
42 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 42 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
43 DCHECK(!shutdown_); 43 DCHECK(!shutdown_);
44 44
45 GlobalRequestID request_id(request_info.child_id(), 45 GlobalRequestID request_id(request_info.child_id(),
46 request_info.request_id()); 46 request_info.request_id());
47 47
48 DCHECK(!ContainsKey(requests_, request_id)) 48 DCHECK(!ContainsKey(requests_, request_id))
49 << "child_id:" << request_info.child_id() 49 << "child_id:" << request_info.child_id()
50 << ", request_id:" << request_info.request_id(); 50 << ", request_id:" << request_info.request_id();
(...skipping 26 matching lines...) Expand all
77 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 77 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
78 DCHECK(!shutdown_); 78 DCHECK(!shutdown_);
79 79
80 DCHECK(ContainsKey(interested_delegates_, request_id)); 80 DCHECK(ContainsKey(interested_delegates_, request_id));
81 DCHECK(ContainsKey(interested_delegates_[request_id], delegate)); 81 DCHECK(ContainsKey(interested_delegates_[request_id], delegate));
82 interested_delegates_[request_id].erase(delegate); 82 interested_delegates_[request_id].erase(delegate);
83 if (interested_delegates_[request_id].empty()) { 83 if (interested_delegates_[request_id].empty()) {
84 interested_delegates_.erase(request_id); 84 interested_delegates_.erase(request_id);
85 85
86 if (ContainsKey(requests_, request_id)) { 86 if (ContainsKey(requests_, request_id)) {
87 URLRequest* request = requests_[request_id]; 87 net::URLRequest* request = requests_[request_id];
88 // The request shouldn't have started (SUCCESS is the initial state). 88 // The request shouldn't have started (SUCCESS is the initial state).
89 DCHECK_EQ(URLRequestStatus::SUCCESS, request->status().status()); 89 DCHECK_EQ(URLRequestStatus::SUCCESS, request->status().status());
90 request->Start(); 90 request->Start();
91 } 91 }
92 } 92 }
93 } 93 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698