Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(429)

Side by Side Diff: chrome/browser/webdata/autofill_profile_syncable_service.h

Issue 17392006: In components/autofill, move browser/ to core/browser/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to fix conflicts Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #ifndef CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_ 4 #ifndef CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
5 #define CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_ 5 #define CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 #include "base/scoped_observer.h" 13 #include "base/scoped_observer.h"
14 #include "base/supports_user_data.h" 14 #include "base/supports_user_data.h"
15 #include "base/synchronization/lock.h" 15 #include "base/synchronization/lock.h"
16 #include "base/threading/non_thread_safe.h" 16 #include "base/threading/non_thread_safe.h"
17 #include "components/autofill/browser/autofill_type.h" 17 #include "components/autofill/core/browser/autofill_type.h"
18 #include "components/autofill/browser/webdata/autofill_change.h" 18 #include "components/autofill/core/browser/webdata/autofill_change.h"
19 #include "components/autofill/browser/webdata/autofill_entry.h" 19 #include "components/autofill/core/browser/webdata/autofill_entry.h"
20 #include "components/autofill/browser/webdata/autofill_webdata_backend.h" 20 #include "components/autofill/core/browser/webdata/autofill_webdata_backend.h"
21 #include "components/autofill/browser/webdata/autofill_webdata_service_observer. h" 21 #include "components/autofill/core/browser/webdata/autofill_webdata_service_obse rver.h"
22 #include "sync/api/sync_change.h" 22 #include "sync/api/sync_change.h"
23 #include "sync/api/sync_data.h" 23 #include "sync/api/sync_data.h"
24 #include "sync/api/sync_error.h" 24 #include "sync/api/sync_error.h"
25 #include "sync/api/syncable_service.h" 25 #include "sync/api/syncable_service.h"
26 #include "sync/protocol/autofill_specifics.pb.h" 26 #include "sync/protocol/autofill_specifics.pb.h"
27 27
28 class ProfileSyncServiceAutofillTest; 28 class ProfileSyncServiceAutofillTest;
29 class WebDataServiceBase; 29 class WebDataServiceBase;
30 30
31 namespace autofill { 31 namespace autofill {
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 std::vector<autofill::AutofillProfile*> profiles_to_add; 214 std::vector<autofill::AutofillProfile*> profiles_to_add;
215 215
216 // When we go through sync we find profiles that are similar but unmatched. 216 // When we go through sync we find profiles that are similar but unmatched.
217 // Merge such profiles. 217 // Merge such profiles.
218 GUIDToProfileMap candidates_to_merge; 218 GUIDToProfileMap candidates_to_merge;
219 // Profiles that have multi-valued fields that are not in sync. 219 // Profiles that have multi-valued fields that are not in sync.
220 std::vector<autofill::AutofillProfile*> profiles_to_sync_back; 220 std::vector<autofill::AutofillProfile*> profiles_to_sync_back;
221 }; 221 };
222 222
223 #endif // CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_ 223 #endif // CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/webdata/autocomplete_syncable_service.cc ('k') | chrome/browser/webdata/autofill_profile_syncable_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698