diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-16 03:09:59 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 16:20:58 +0100 |
| commit | edbdbb0cb4f6684b9258ca7f7eed628a52c2b96a (patch) | |
| tree | 0d5523e0ad15a2b382e916b3941fbce9c739b674 /chrome | |
| parent | e4feccc6428acb735e68c15bcf972504a705c547 (diff) | |
| download | external_chromium-edbdbb0cb4f6684b9258ca7f7eed628a52c2b96a.zip external_chromium-edbdbb0cb4f6684b9258ca7f7eed628a52c2b96a.tar.gz external_chromium-edbdbb0cb4f6684b9258ca7f7eed628a52c2b96a.tar.bz2 | |
Merge Chromium at r11.0.696.0: Fix conflict in sqlite_presistent_cookie_store.cc
Added includes close to Android guard:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/net/sqlite_persistent_cookie_store.cc?view=diff&pathrev=77261&r1=76386&r2=76387
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/net/sqlite_persistent_cookie_store.cc?view=diff&pathrev=77261&r1=75889&r2=75890
Change-Id: I1c9751069e23f6bdd7404b7ea8818a07efe47265
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/net/sqlite_persistent_cookie_store.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc index a446fff..b981dd0 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc @@ -18,11 +18,11 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/threading/thread.h" -<<<<<<< HEAD -#ifndef ANDROID -#include "chrome/browser/browser_thread.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" +#ifndef ANDROID +#include "content/browser/browser_thread.h" #endif +#include "googleurl/src/gurl.h" #ifdef ANDROID base::Thread* getDbThread() @@ -46,11 +46,6 @@ base::Thread* getDbThread() return dbThread; } #endif -======= -#include "chrome/browser/diagnostics/sqlite_diagnostics.h" -#include "content/browser/browser_thread.h" -#include "googleurl/src/gurl.h" ->>>>>>> chromium.org at r11.0.696.0 using base::Time; |