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

Side by Side Diff: components/sync_driver/model_association_manager.cc

Issue 1110833002: [autofill] Sync server card and address metadata. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Work Created 5 years, 7 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/sync_driver/model_association_manager.h" 5 #include "components/sync_driver/model_association_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 13 matching lines...) Expand all
24 syncer::DEVICE_INFO, // Listed for completeness. 24 syncer::DEVICE_INFO, // Listed for completeness.
25 syncer::EXPERIMENTS, // Listed for completeness. 25 syncer::EXPERIMENTS, // Listed for completeness.
26 syncer::PROXY_TABS, // Listed for completeness. 26 syncer::PROXY_TABS, // Listed for completeness.
27 27
28 // Kick off the association of the non-UI types first so they can associate 28 // Kick off the association of the non-UI types first so they can associate
29 // in parallel with the UI types. 29 // in parallel with the UI types.
30 syncer::PASSWORDS, 30 syncer::PASSWORDS,
31 syncer::AUTOFILL, 31 syncer::AUTOFILL,
32 syncer::AUTOFILL_PROFILE, 32 syncer::AUTOFILL_PROFILE,
33 syncer::AUTOFILL_WALLET_DATA, 33 syncer::AUTOFILL_WALLET_DATA,
34 syncer::AUTOFILL_WALLET_METADATA,
34 syncer::EXTENSION_SETTINGS, 35 syncer::EXTENSION_SETTINGS,
35 syncer::APP_SETTINGS, 36 syncer::APP_SETTINGS,
36 syncer::TYPED_URLS, 37 syncer::TYPED_URLS,
37 syncer::HISTORY_DELETE_DIRECTIVES, 38 syncer::HISTORY_DELETE_DIRECTIVES,
38 syncer::SYNCED_NOTIFICATIONS, 39 syncer::SYNCED_NOTIFICATIONS,
39 syncer::SYNCED_NOTIFICATION_APP_INFO, 40 syncer::SYNCED_NOTIFICATION_APP_INFO,
40 41
41 // UI thread data types. 42 // UI thread data types.
42 syncer::BOOKMARKS, 43 syncer::BOOKMARKS,
43 syncer::SUPERVISED_USERS, // Syncing supervised users on initial login 44 syncer::SUPERVISED_USERS, // Syncing supervised users on initial login
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 413
413 delegate_->OnModelAssociationDone(result); 414 delegate_->OnModelAssociationDone(result);
414 } 415 }
415 416
416 base::OneShotTimer<ModelAssociationManager>* 417 base::OneShotTimer<ModelAssociationManager>*
417 ModelAssociationManager::GetTimerForTesting() { 418 ModelAssociationManager::GetTimerForTesting() {
418 return &timer_; 419 return &timer_;
419 } 420 }
420 421
421 } // namespace sync_driver 422 } // namespace sync_driver
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698