chrome/browser/webdata/autofill_profile_syncable_service.h - Issue 22009003: [Autofill] Distinguish between native field types and potentially HTML field types.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/webdata/autofill_profile_syncable_service.h

Issue 22009003: [Autofill] Distinguish between native field types and potentially HTML field types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/options/autofill_options_handler.cc ('k') | chrome/browser/webdata/autofill_profile_syncable_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/webdata/autofill_profile_syncable_service.h

diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.h b/chrome/browser/webdata/autofill_profile_syncable_service.h

index 498d3aa606cc05068dd1afb4f00f3c2f9ec807ca..b7506c3189a0cb02836f08f8dc152e44e52cef63 100644

--- a/chrome/browser/webdata/autofill_profile_syncable_service.h

+++ b/chrome/browser/webdata/autofill_profile_syncable_service.h

@@ -14,7 +14,7 @@

#include "base/supports_user_data.h"

#include "base/synchronization/lock.h"

#include "base/threading/non_thread_safe.h"

-#include "components/autofill/core/browser/autofill_type.h"

+#include "components/autofill/core/browser/field_types.h"

#include "components/autofill/core/browser/webdata/autofill_change.h"

#include "components/autofill/core/browser/webdata/autofill_entry.h"

#include "components/autofill/core/browser/webdata/autofill_webdata_backend.h"

@@ -162,12 +162,12 @@ class AutofillProfileSyncableService

// Helper to compare the local value and cloud value of a field, copy into

// the local value if they differ, and return whether the change happened.

- static bool UpdateField(autofill::AutofillFieldType field_type,

+ static bool UpdateField(autofill::ServerFieldType field_type,

const std::string& new_value,

autofill::AutofillProfile* autofill_profile);

// The same as |UpdateField|, but for multi-valued fields.

static bool UpdateMultivaluedField(

- autofill::AutofillFieldType field_type,

+ autofill::ServerFieldType field_type,

const ::google::protobuf::RepeatedPtrField<std::string>& new_value,

autofill::AutofillProfile* autofill_profile);