| Index: net/cookies/cookie_monster.h
|
| diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h
|
| index 5a0692239162c30bedd88fd496a7c0df975f6f13..05dd445983989bde3f00fb2628657c8386393ce8 100644
|
| --- a/net/cookies/cookie_monster.h
|
| +++ b/net/cookies/cookie_monster.h
|
| @@ -170,7 +170,6 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
| CookiePriority priority,
|
| const SetCookiesCallback& callback);
|
|
|
| -
|
| // Returns all the cookies, for use in management UI, etc. This does not mark
|
| // the cookies as having been accessed.
|
| // The returned cookies are ordered by longest path, then by earliest
|
| @@ -194,8 +193,7 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
| // regardless of path. This includes all http_only and secure cookies,
|
| // but does not include any domain cookies that may apply to this host.
|
| // Returns the number of cookies deleted.
|
| - void DeleteAllForHostAsync(const GURL& url,
|
| - const DeleteCallback& callback);
|
| + void DeleteAllForHostAsync(const GURL& url, const DeleteCallback& callback);
|
|
|
| // Deletes one specific cookie.
|
| void DeleteCanonicalCookieAsync(const CanonicalCookie& cookie,
|
| @@ -259,9 +257,9 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
| const GetCookieListCallback& callback) OVERRIDE;
|
|
|
| // Deletes all cookies with that might apply to |url| that has |cookie_name|.
|
| - virtual void DeleteCookieAsync(
|
| - const GURL& url, const std::string& cookie_name,
|
| - const base::Closure& callback) OVERRIDE;
|
| + virtual void DeleteCookieAsync(const GURL& url,
|
| + const std::string& cookie_name,
|
| + const base::Closure& callback) OVERRIDE;
|
|
|
| // Deletes all of the cookies that have a creation_date greater than or equal
|
| // to |delete_begin| and less than |delete_end|.
|
| @@ -310,7 +308,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
| private:
|
| // For queueing the cookie monster calls.
|
| class CookieMonsterTask;
|
| - template <typename Result> class DeleteTask;
|
| + template <typename Result>
|
| + class DeleteTask;
|
| class DeleteAllCreatedBetweenTask;
|
| class DeleteAllCreatedBetweenForHostTask;
|
| class DeleteAllForHostTask;
|
| @@ -383,7 +382,6 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
| // value. However, we used to allow them, so we are now evicting any such
|
| // cookies as we load them. See http://crbug.com/238041.
|
| DELETE_COOKIE_CONTROL_CHAR,
|
| -
|
| DELETE_COOKIE_LAST_ENTRY
|
| };
|
|
|
| @@ -476,9 +474,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
| // (eTLD+1). Called when all cookies for the domain key(eTLD+1) have been
|
| // loaded from DB. See PersistentCookieStore::Load for details on the contents
|
| // of cookies.
|
| - void OnKeyLoaded(
|
| - const std::string& key,
|
| - const std::vector<CanonicalCookie*>& cookies);
|
| + void OnKeyLoaded(const std::string& key,
|
| + const std::vector<CanonicalCookie*>& cookies);
|
|
|
| // Stores the loaded cookies.
|
| void StoreLoadedCookies(const std::vector<CanonicalCookie*>& cookies);
|
| @@ -549,7 +546,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
| // the correct CookieMonsterDelegate::ChangeCause for OnCookieChanged
|
| // notifications. Guarantee: All iterators to cookies_ except to the
|
| // deleted entry remain vaild.
|
| - void InternalDeleteCookie(CookieMap::iterator it, bool sync_to_store,
|
| + void InternalDeleteCookie(CookieMap::iterator it,
|
| + bool sync_to_store,
|
| DeletionCause deletion_cause);
|
|
|
| // If the number of cookies for CookieMap key |key|, or globally, are
|
| @@ -603,7 +601,7 @@ class NET_EXPORT CookieMonster : public CookieStore {
|
| // Runs the task if, or defers the task until, the cookies for the given URL
|
| // are loaded.
|
| void DoCookieTaskForURL(const scoped_refptr<CookieMonsterTask>& task_item,
|
| - const GURL& url);
|
| + const GURL& url);
|
|
|
| // Histogram variables; see CookieMonster::InitializeHistograms() in
|
| // cookie_monster.cc for details.
|
| @@ -720,6 +718,7 @@ class NET_EXPORT CookieMonsterDelegate
|
| virtual void OnCookieChanged(const CanonicalCookie& cookie,
|
| bool removed,
|
| ChangeCause cause) = 0;
|
| +
|
| protected:
|
| friend class base::RefCountedThreadSafe<CookieMonsterDelegate>;
|
| virtual ~CookieMonsterDelegate() {}
|
|
|