From f5c16878840c58e6e0b1622e0cd950fe27ae7832 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 25 May 2011 12:07:14 +0100 Subject: Merge chromium at 10.0.634.0: Compile fixes base/thread.h moved to base/threading/thread.h: http://codereview.chromium.org/6028009 base/condition_variable.h base/lock.h moved to base/synchronization and classes added to base namespace: http://codereview.chromium.org/6018013 Change-Id: I74d14224d6b17df33bc1cc9a5521fd267f4e830c --- Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h') diff --git a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h index dc101db..224fa65 100644 --- a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h +++ b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h @@ -36,10 +36,10 @@ #include #include -class Lock; -class ConditionVariable; namespace base { +class ConditionVariable; +class Lock; class Thread; } @@ -118,8 +118,8 @@ private: // Mutex and condition variable used for synchronous requests. // Note that these are static. This works because there's only one main thread. - static Lock* syncLock(); - static ConditionVariable* syncCondition(); + static base::Lock* syncLock(); + static base::ConditionVariable* syncCondition(); // Queue of callbacks to be executed by the main thread. Must only be accessed inside mutex. std::deque m_queue; -- cgit v1.1