summaryrefslogtreecommitdiffstats
path: root/net/base/cookie_monster.h
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 00:58:21 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 00:58:21 +0000
commit93460df54fc34d3a20387e5d49845a4a700c4870 (patch)
tree2f566063be03e85b475e354ec91b0bc56537830a /net/base/cookie_monster.h
parent4a5d8a763f04a972891cc2103ae37073b5932834 (diff)
downloadchromium_src-93460df54fc34d3a20387e5d49845a4a700c4870.zip
chromium_src-93460df54fc34d3a20387e5d49845a4a700c4870.tar.gz
chromium_src-93460df54fc34d3a20387e5d49845a4a700c4870.tar.bz2
Cookie transfer for initial account creation case on ChromeOS.
BUG=chromium-os:17470 TEST=CookieMonsterTest.InitializeFromCookieMonster Review URL: http://codereview.chromium.org/7397007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/cookie_monster.h')
-rw-r--r--net/base/cookie_monster.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h
index 910e9f8..d6161ce 100644
--- a/net/base/cookie_monster.h
+++ b/net/base/cookie_monster.h
@@ -160,6 +160,11 @@ class NET_API CookieMonster : public CookieStore {
bool secure, bool http_only,
const SetCookiesCallback& callback);
+
+ // Helper function that adds all cookies from |cookie_monster| into this
+ // instance.
+ bool InitializeFrom(CookieMonster* cookie_monster);
+
// 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
@@ -461,7 +466,6 @@ class NET_API CookieMonster : public CookieStore {
const base::Time& creation_time,
const CookieOptions& options);
-
// Helper function that sets a canonical cookie, deleting equivalents and
// performing garbage collection.
bool SetCanonicalCookie(scoped_ptr<CanonicalCookie>* cc,