diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-05 19:44:52 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:05 +0100 |
| commit | 4830184c9a6d4b40d7f887b921aefa25bf4d3ad3 (patch) | |
| tree | d2da4e2b88ecbc4f5c5e36630eb1d6b3bcd59144 | |
| parent | 80b02f653a8dd9e96eaa219647537e15a87d9330 (diff) | |
| download | external_chromium-4830184c9a6d4b40d7f887b921aefa25bf4d3ad3.zip external_chromium-4830184c9a6d4b40d7f887b921aefa25bf4d3ad3.tar.gz external_chromium-4830184c9a6d4b40d7f887b921aefa25bf4d3ad3.tar.bz2 | |
Merge Chromium at r12.0.742.93: Fix conflicts in web_data_service.h
Upstream changed include to forward declearing a struct
http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/webdata/web_data_service.h?r1=77630&r2=78215&pathrev=88489
Change-Id: If1e2609b3f22f521448e044efa666af3cda3c72b
| -rw-r--r-- | chrome/browser/webdata/web_data_service.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index 92f0b5c..2bc18f3 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -22,16 +22,10 @@ #include "chrome/browser/search_engines/template_url_id.h" #ifndef ANDROID #include "content/browser/browser_thread.h" -<<<<<<< HEAD #endif #ifdef ANDROID #include "third_party/skia/include/core/SkBitmap.h" -#include <WebCoreSupport/autofill/FormFieldAndroid.h> -#else -#include "webkit/glue/form_field.h" #endif -======= ->>>>>>> chromium.org at r12.0.742.93 class AutofillChange; class AutofillProfile; |