diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-08 11:31:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-08 11:31:38 -0700 |
| commit | bbab1cbee6c7511141a392cbd6ac540106dcf666 (patch) | |
| tree | 07ca09b681d98522bbec8977a616cde81960ec11 /Source/WebKit/android/WebCoreSupport/WebCookieJar.h | |
| parent | 14aedd589190a096c80d5a8e7dc978e6b5147458 (diff) | |
| parent | a37288025960d07eaad4f09905dbb9734c389c22 (diff) | |
| download | external_webkit-bbab1cbee6c7511141a392cbd6ac540106dcf666.zip external_webkit-bbab1cbee6c7511141a392cbd6ac540106dcf666.tar.gz external_webkit-bbab1cbee6c7511141a392cbd6ac540106dcf666.tar.bz2 | |
Merge changes I02f589b6,Ie54a0054,I80966819,Ib8898076,Ie3d53bc3
* changes:
Merge Chromium at r12.0.742.93: Direct access in FormField
Merge Chromium at r12.0.742.93: Autofill fixes
Merge Chromium at r12.0.742.93: Snapstart error code removed
Merge Chromium at r12.0.742.93: CookiePolicy update
Merge Chromium at r12.0.742.93: Updating include paths
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; }; } |