OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" | 5 #include "chrome/browser/webdata/autofill_profile_syncable_service.h" |
6 | 6 |
7 #include "base/guid.h" | 7 #include "base/guid.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
11 #include "chrome/browser/browser_process.h" | |
11 #include "components/autofill/browser/autofill_profile.h" | 12 #include "components/autofill/browser/autofill_profile.h" |
12 #include "components/autofill/browser/form_group.h" | 13 #include "components/autofill/browser/form_group.h" |
13 #include "components/webdata/autofill/autofill_table.h" | 14 #include "components/webdata/autofill/autofill_table.h" |
14 #include "components/webdata/autofill/autofill_webdata_service.h" | 15 #include "components/webdata/autofill/autofill_webdata_service.h" |
15 #include "components/webdata/common/web_database.h" | 16 #include "components/webdata/common/web_database.h" |
16 #include "content/public/browser/browser_thread.h" | 17 #include "content/public/browser/browser_thread.h" |
17 #include "sync/api/sync_error.h" | 18 #include "sync/api/sync_error.h" |
18 #include "sync/api/sync_error_factory.h" | 19 #include "sync/api/sync_error_factory.h" |
19 #include "sync/protocol/sync.pb.h" | 20 #include "sync/protocol/sync.pb.h" |
20 | 21 |
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
545 } | 546 } |
546 } | 547 } |
547 if (changed) | 548 if (changed) |
548 autofill_profile->SetRawMultiInfo(field_type, values); | 549 autofill_profile->SetRawMultiInfo(field_type, values); |
549 return changed; | 550 return changed; |
550 } | 551 } |
551 | 552 |
552 bool AutofillProfileSyncableService::MergeProfile( | 553 bool AutofillProfileSyncableService::MergeProfile( |
553 const AutofillProfile& merge_from, | 554 const AutofillProfile& merge_from, |
554 AutofillProfile* merge_into) { | 555 AutofillProfile* merge_into) { |
555 merge_into->OverwriteWithOrAddTo(merge_from); | 556 merge_into->OverwriteWithOrAddTo( |
557 merge_from, g_browser_process->GetApplicationLocale()); | |
Ilya Sherman
2013/04/04 04:27:38
I'm pretty sure that AutofillProfileSyncableServic
jam
2013/04/04 17:58:12
thanks, fixed.
| |
556 return (merge_into->Compare(merge_from) != 0); | 558 return (merge_into->Compare(merge_from) != 0); |
557 } | 559 } |
558 | 560 |
559 AutofillTable* AutofillProfileSyncableService::GetAutofillTable() const { | 561 AutofillTable* AutofillProfileSyncableService::GetAutofillTable() const { |
560 return AutofillTable::FromWebDatabase(web_data_service_->GetDatabase()); | 562 return AutofillTable::FromWebDatabase(web_data_service_->GetDatabase()); |
561 } | 563 } |
562 | 564 |
563 AutofillProfileSyncableService::DataBundle::DataBundle() {} | 565 AutofillProfileSyncableService::DataBundle::DataBundle() {} |
564 | 566 |
565 AutofillProfileSyncableService::DataBundle::~DataBundle() {} | 567 AutofillProfileSyncableService::DataBundle::~DataBundle() {} |
OLD | NEW |