summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 22:14:18 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 22:14:18 +0000
commit7127ca8f76464fbc40f578034254b0ce778a6dae (patch)
tree9bb797184c3a87445b34728c2dddf088fc461d03 /chrome/browser/sync
parent77c93df6ab9299e0f28349966caf391f1d1d35e5 (diff)
downloadchromium_src-7127ca8f76464fbc40f578034254b0ce778a6dae.zip
chromium_src-7127ca8f76464fbc40f578034254b0ce778a6dae.tar.gz
chromium_src-7127ca8f76464fbc40f578034254b0ce778a6dae.tar.bz2
autofill: Rename AutoFillFieldType to AutofillFieldType.
BUG=72758 TEST=compiled locally and trybots Review URL: http://codereview.chromium.org/6592067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/glue/autofill_model_associator.cc2
-rw-r--r--chrome/browser/sync/glue/autofill_profile_model_associator.cc2
-rw-r--r--chrome/browser/sync/glue/autofill_profile_model_associator.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/sync/glue/autofill_model_associator.cc b/chrome/browser/sync/glue/autofill_model_associator.cc
index 9a106d4..ae71788 100644
--- a/chrome/browser/sync/glue/autofill_model_associator.cc
+++ b/chrome/browser/sync/glue/autofill_model_associator.cc
@@ -496,7 +496,7 @@ bool AutofillModelAssociator::MergeTimestamps(
// Helper to compare the local value and cloud value of a field, merge into
// the local value if they differ, and return whether the merge happened.
-bool MergeField(FormGroup* f, AutoFillFieldType t,
+bool MergeField(FormGroup* f, AutofillFieldType t,
const std::string& specifics_field) {
if (UTF16ToUTF8(f->GetFieldText(AutoFillType(t))) == specifics_field)
return false;
diff --git a/chrome/browser/sync/glue/autofill_profile_model_associator.cc b/chrome/browser/sync/glue/autofill_profile_model_associator.cc
index e75941a..8e263f3 100644
--- a/chrome/browser/sync/glue/autofill_profile_model_associator.cc
+++ b/chrome/browser/sync/glue/autofill_profile_model_associator.cc
@@ -208,7 +208,7 @@ bool AutofillProfileModelAssociator::DisassociateModels() {
// Helper to compare the local value and cloud value of a field, merge into
// the local value if they differ, and return whether the merge happened.
bool AutofillProfileModelAssociator::MergeField(FormGroup* f,
- AutoFillFieldType t,
+ AutofillFieldType t,
const std::string& specifics_field) {
if (UTF16ToUTF8(f->GetFieldText(AutoFillType(t))) == specifics_field)
return false;
diff --git a/chrome/browser/sync/glue/autofill_profile_model_associator.h b/chrome/browser/sync/glue/autofill_profile_model_associator.h
index f5d999ea..377d597 100644
--- a/chrome/browser/sync/glue/autofill_profile_model_associator.h
+++ b/chrome/browser/sync/glue/autofill_profile_model_associator.h
@@ -145,7 +145,7 @@ class AutofillProfileModelAssociator
bool LoadAutofillData(std::vector<AutoFillProfile*>* profiles);
static bool MergeField(FormGroup* f,
- AutoFillFieldType t,
+ AutofillFieldType t,
const std::string& specifics_field);
// Helper to persist any changes that occured during model association to