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

Unified Diff: chrome/browser/cancelable_request.h

Issue 3149: Porting changes in chrome/{browser,common}, also enabling more unit tests.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/cancelable_request.h
===================================================================
--- chrome/browser/cancelable_request.h (revision 2402)
+++ chrome/browser/cancelable_request.h (working copy)
@@ -237,7 +237,7 @@
// Cancels all requests outstanding.
void CancelAllRequests() {
PendingRequestList copied_requests(pending_requests_);
- for (PendingRequestList::iterator i = copied_requests.begin();
+ for (typename PendingRequestList::iterator i = copied_requests.begin();
i != copied_requests.end(); ++i)
i->first.provider->CancelRequest(i->first.handle);
copied_requests.clear();
@@ -249,7 +249,7 @@
// Gets the client data for all pending requests.
void GetAllClientData(std::vector<T>* data) {
DCHECK(data);
- for (PendingRequestList::iterator i = pending_requests_.begin();
+ for (typename PendingRequestList::iterator i = pending_requests_.begin();
i != pending_requests_.end(); ++i)
data->push_back(i->second);
}
@@ -282,7 +282,7 @@
virtual void OnRequestRemoved(CancelableRequestProvider* provider,
CancelableRequestProvider::Handle handle) {
- PendingRequestList::iterator i =
+ typename PendingRequestList::iterator i =
pending_requests_.find(PendingRequest(provider, handle));
if (i == pending_requests_.end()) {
NOTREACHED() << "Got a complete notification for a nonexistant request";
@@ -517,8 +517,9 @@
template<typename CB, typename Type>
class CancelableRequest1 : public CancelableRequest<CB> {
public:
- explicit CancelableRequest1(CallbackType* callback)
- : CancelableRequest(callback) {
+ explicit CancelableRequest1(
+ typename CancelableRequest<CB>::CallbackType* callback)
+ : CancelableRequest<CB>(callback) {
}
virtual ~CancelableRequest1() {

Powered by Google App Engine
This is Rietveld 408576698