diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-12 12:11:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:55:19 +0100 |
| commit | 565f3234542b5ed4c247560b31cbd513aec8ce6b (patch) | |
| tree | f8b8710a864372bfd1a9c1e2ac64043877f57e84 /net | |
| parent | 41136caa3b2b6506238ebf2e11eaf13d023cecdb (diff) | |
| download | external_chromium-565f3234542b5ed4c247560b31cbd513aec8ce6b.zip external_chromium-565f3234542b5ed4c247560b31cbd513aec8ce6b.tar.gz external_chromium-565f3234542b5ed4c247560b31cbd513aec8ce6b.tar.bz2 | |
Merge Chromium at 10.0.621.0: Fix conflict in cookie_monster.*
Conflicts from:
http://codereview.chromium.org/5365010
Which was upstreaming the patch.
Change-Id: Ic28f15156ec57630123e22dcf02f865e9aeef41d
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/cookie_monster.cc | 8 | ||||
| -rw-r--r-- | net/base/cookie_monster.h | 13 |
2 files changed, 0 insertions, 21 deletions
diff --git a/net/base/cookie_monster.cc b/net/base/cookie_monster.cc index 76589c7..d246557 100644 --- a/net/base/cookie_monster.cc +++ b/net/base/cookie_monster.cc @@ -407,15 +407,11 @@ void CookieMonster::SetExpiryAndKeyScheme(ExpiryAndKeyScheme key_scheme) { expiry_and_key_scheme_ = key_scheme; } -<<<<<<< HEAD -#if defined(ANDROID) -======= void CookieMonster::SetClearPersistentStoreOnExit(bool clear_local_store) { if(store_) store_->SetClearLocalStateOnExit(clear_local_store); } ->>>>>>> chromium.org at r10.0.621.0 void CookieMonster::FlushStore(Task* completion_task) { AutoLock autolock(lock_); if (initialized_ && store_) @@ -423,10 +419,6 @@ void CookieMonster::FlushStore(Task* completion_task) { else if (completion_task) MessageLoop::current()->PostTask(FROM_HERE, completion_task); } -<<<<<<< HEAD -#endif -======= ->>>>>>> chromium.org at r10.0.621.0 // The system resolution is not high enough, so we can have multiple // set cookies that result in the same system time. When this happens, we diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h index 2c66554..3b4bfd2 100644 --- a/net/base/cookie_monster.h +++ b/net/base/cookie_monster.h @@ -224,20 +224,12 @@ class CookieMonster : public CookieStore { static void EnableFileScheme(); static bool enable_file_scheme_; -<<<<<<< HEAD -#if defined(ANDROID) -======= ->>>>>>> chromium.org at r10.0.621.0 // Flush the backing store (if any) to disk and post the given task when done. // WARNING: THE CALLBACK WILL RUN ON A RANDOM THREAD. IT MUST BE THREAD SAFE. // It may be posted to the current thread, or it may run on the thread that // actually does the flushing. Your Task should generally post a notification // to the thread you actually want to be notified on. void FlushStore(Task* completion_task); -<<<<<<< HEAD -#endif -======= ->>>>>>> chromium.org at r10.0.621.0 private: ~CookieMonster(); @@ -725,11 +717,6 @@ class CookieMonster::PersistentCookieStore // Flush the store and post the given Task when complete. virtual void Flush(Task* completion_task) = 0; -#if defined(ANDROID) - // Flush the store and post the given Task when complete. - virtual void Flush(Task* completion_task) = 0; -#endif - protected: PersistentCookieStore() {} |