From 137f702fd336e45a37a8feccbaf74756ff5bfa03 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Thu, 2 Jun 2011 16:05:14 +0100 Subject: Merge Chromium at r11.0.672.0: Fix conflicts in autofill_downlad.cc Local commit between two remote changes: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.cc?view=diff&pathrev=74924&r1=72584&r2=72585 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.cc?view=diff&pathrev=74924&r1=72787&r2=72788 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.cc?r1=73232&r2=73921&pathrev=77261 Android doesn't need to be forced into the list as official build anymore since autofill is enabled for all versions. Change-Id: I13ae0d9724d61f49aba5fc4108605cd4921c8345 --- chrome/browser/autofill/autofill_download.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'chrome/browser/autofill/autofill_download.cc') diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc index c571d7b..783ba64 100644 --- a/chrome/browser/autofill/autofill_download.cc +++ b/chrome/browser/autofill/autofill_download.cc @@ -23,19 +23,9 @@ "http://toolbarqueries.clients.google.com:80/tbproxy/af/upload" #define AUTO_FILL_QUERY_SERVER_NAME_START_IN_HEADER "GFE/" -<<<<<<< HEAD -#if defined(GOOGLE_CHROME_BUILD) || (defined(ANDROID) && defined(HAVE_AUTOFILL_DOWNLOAD_INTERNAL_H) && HAVE_AUTOFILL_DOWNLOAD_INTERNAL_H) -#include "chrome/browser/autofill/internal/autofill_download_internal.h" -#else -#define AUTO_FILL_QUERY_SERVER_REQUEST_URL DISABLED_REQUEST_URL -#define AUTO_FILL_UPLOAD_SERVER_REQUEST_URL DISABLED_REQUEST_URL -#define AUTO_FILL_QUERY_SERVER_NAME_START_IN_HEADER "SOMESERVER/" -#endif -======= namespace { const size_t kMaxFormCacheSize = 16; }; ->>>>>>> chromium.org at r11.0.672.0 struct AutoFillDownloadManager::FormRequestData { std::vector form_signatures; -- cgit v1.1