diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 18:15:58 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 9aa5f8b435409e063e76e6e4f12f5c4e85997e0a (patch) | |
| tree | 574138578fb7507010d4db1c9f094b899a63f8c5 /chrome | |
| parent | 7375b0cf763978c2988cd0784818fbedd11ce85a (diff) | |
| download | external_chromium-9aa5f8b435409e063e76e6e4f12f5c4e85997e0a.zip external_chromium-9aa5f8b435409e063e76e6e4f12f5c4e85997e0a.tar.gz external_chromium-9aa5f8b435409e063e76e6e4f12f5c4e85997e0a.tar.bz2 | |
Merge Chromium at 10.0.634.0: Fix conflict and compile from thread.h move
thread.h was moved in this CL:
http://codereview.chromium.org/6028009
Change-Id: I19110c2c356d07b3e3bd5256161bec45c21c057f
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/net/sqlite_persistent_cookie_store.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc index 404170a..58f4b91 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc @@ -17,12 +17,8 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -<<<<<<< HEAD -#include "base/thread.h" -#ifndef ANDROID -======= #include "base/threading/thread.h" ->>>>>>> chromium.org at r10.0.634.0 +#ifndef ANDROID #include "chrome/browser/browser_thread.h" #include "chrome/browser/diagnostics/sqlite_diagnostics.h" #endif |