diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-21 20:51:10 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-30 13:29:14 +0100 |
| commit | df8681736ba20032c392b1e112a93ac7e5fe0335 (patch) | |
| tree | eac9e88cbac03ec6c7ca44af9a3cd4a21b314873 /chrome | |
| parent | 51f5de21d001cc78ae017283399a58c0c1c9b974 (diff) | |
| download | external_chromium-df8681736ba20032c392b1e112a93ac7e5fe0335.zip external_chromium-df8681736ba20032c392b1e112a93ac7e5fe0335.tar.gz external_chromium-df8681736ba20032c392b1e112a93ac7e5fe0335.tar.bz2 | |
Merge Chromium at r11.0.696.0: Compile fix in web_data_service.h
Adding includes that are no longer indirectly included on Android
Change-Id: Ib52b786310342220e975fe868c8e5e862886d24d
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/webdata/web_data_service.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index 3d2e41e..09f4623 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -14,6 +14,11 @@ #include "base/file_path.h" #include "base/ref_counted.h" #include "base/synchronization/lock.h" +#ifdef ANDROID +// TODO(kristianm): Quick upstream +#include "base/task.h" +#include "base/time.h" +#endif #include "chrome/browser/search_engines/template_url_id.h" #ifndef ANDROID #include "content/browser/browser_thread.h" |