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

Unified Diff: chrome/browser/cancelable_request.h

Issue 5977010: Move CancellationFlag and WaitableEvent to the synchronization subdirectory.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 12 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
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/cancelable_request.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cancelable_request.h
===================================================================
--- chrome/browser/cancelable_request.h (revision 70364)
+++ chrome/browser/cancelable_request.h (working copy)
@@ -92,12 +92,12 @@
#include "base/basictypes.h"
#include "base/callback.h"
-#include "base/cancellation_flag.h"
#include "base/lock.h"
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
+#include "base/synchronization/cancellation_flag.h"
#include "base/task.h"
#include "build/build_config.h"
@@ -148,7 +148,7 @@
friend class CancelableRequestBase;
- Lock pending_request_lock_;
+ base::Lock pending_request_lock_;
// Lists all outstanding requests. Protected by the |lock_|.
CancelableRequestMap pending_requests_;
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/cancelable_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698