diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-07 15:44:56 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-07 17:21:23 +0100 |
| commit | 11aad316ddd7f5db407a4fc1bdd26ba6b8ba912d (patch) | |
| tree | 9ab106831e7e2f19e0f26e5b1fe268abf169b7d4 /Source/WebKit/android/WebCoreSupport/WebCookieJar.h | |
| parent | ebf2dce03f8bdd209dc0aaae609cd6bad8686345 (diff) | |
| download | external_webkit-11aad316ddd7f5db407a4fc1bdd26ba6b8ba912d.zip external_webkit-11aad316ddd7f5db407a4fc1bdd26ba6b8ba912d.tar.gz external_webkit-11aad316ddd7f5db407a4fc1bdd26ba6b8ba912d.tar.bz2 | |
Merge Chromium at r12.0.742.93: CookiePolicy update
Async functionality removed, and const added. Needed to make
the Mutex mutable so it can be changed in the const function.
Chromium CL:
http://src.chromium.org/viewvc/chrome/branches/742/src/net/base/cookie_policy.h?view=diff&pathrev=88489&r1=80659&r2=80660
Change-Id: Ib8898076cd6a22ccac4f719bc9ed437bf36d7b44
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/WebCookieJar.h')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebCookieJar.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebCookieJar.h b/Source/WebKit/android/WebCoreSupport/WebCookieJar.h index 1f4266c..b6490af 100644 --- a/Source/WebKit/android/WebCoreSupport/WebCookieJar.h +++ b/Source/WebKit/android/WebCoreSupport/WebCookieJar.h @@ -43,8 +43,8 @@ public: static void flush(); // CookiePolicy implementation from external/chromium - virtual int CanGetCookies(const GURL& url, const GURL& first_party_for_cookies, net::CompletionCallback*); - virtual int CanSetCookie(const GURL& url, const GURL& first_party_for_cookies, const std::string& cookie_line, net::CompletionCallback*); + virtual int CanGetCookies(const GURL& url, const GURL& first_party_for_cookies) const; + virtual int CanSetCookie(const GURL& url, const GURL& first_party_for_cookies, const std::string& cookie_line) const; bool allowCookies(); void setAllowCookies(bool allow); @@ -70,7 +70,7 @@ private: scoped_refptr<SQLitePersistentCookieStore> m_cookieDb; scoped_refptr<net::CookieStore> m_cookieStore; bool m_allowCookies; - WTF::Mutex m_allowCookiesMutex; + mutable WTF::Mutex m_allowCookiesMutex; }; } |