summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cancelable_request.h
diff options
context:
space:
mode:
authorerikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-12 17:55:37 +0000
committererikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-12 17:55:37 +0000
commit0f19f563ad5449d28b5764337cb1bbef0e5f83a3 (patch)
treeaed1a9811af865a9ae2cc211f4f172c35222eb79 /chrome/browser/cancelable_request.h
parent31663dd403b2e4b69a0ec411c377a8c8642cf7d8 (diff)
downloadchromium_src-0f19f563ad5449d28b5764337cb1bbef0e5f83a3.zip
chromium_src-0f19f563ad5449d28b5764337cb1bbef0e5f83a3.tar.gz
chromium_src-0f19f563ad5449d28b5764337cb1bbef0e5f83a3.tar.bz2
Fix a few places that wind up using Lock recursively.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cancelable_request.h')
-rw-r--r--chrome/browser/cancelable_request.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h
index f1455b7..0aeb3e8e 100644
--- a/chrome/browser/cancelable_request.h
+++ b/chrome/browser/cancelable_request.h
@@ -156,6 +156,9 @@ class CancelableRequestProvider {
void RequestCompleted(Handle handle);
private:
+ // Only call this when you already have acquired pending_request_lock_.
+ void CancelRequestLocked(Handle handle);
+
friend class CancelableRequestBase;
typedef std::map<Handle, scoped_refptr<CancelableRequestBase> >