summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autofill/autofill_download.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/autofill/autofill_download.h')
-rw-r--r--chrome/browser/autofill/autofill_download.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/autofill/autofill_download.h b/chrome/browser/autofill/autofill_download.h
index a3a66fd..9220ad1 100644
--- a/chrome/browser/autofill/autofill_download.h
+++ b/chrome/browser/autofill/autofill_download.h
@@ -16,10 +16,14 @@
#include "chrome/browser/autofill/form_structure.h"
#include "chrome/common/net/url_fetcher.h"
+<<<<<<< HEAD
#ifdef ANDROID
#include "android/autofill/url_fetcher_proxy.h"
#endif
+=======
+class AutoFillMetrics;
+>>>>>>> chromium.org at r10.0.621.0
class Profile;
// Handles getting and updating AutoFill heuristics.
@@ -64,7 +68,8 @@ class AutoFillDownloadManager : public URLFetcher::Delegate {
// Starts a query request to AutoFill servers. The observer is called with the
// list of the fields of all requested forms.
// |forms| - array of forms aggregated in this request.
- bool StartQueryRequest(const ScopedVector<FormStructure>& forms);
+ bool StartQueryRequest(const ScopedVector<FormStructure>& forms,
+ const AutoFillMetrics& metric_logger);
// Start upload request if necessary. The probability of request going
// over the wire are GetPositiveUploadRate() if it was matched by