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

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

Issue 754963004: Add a datatype for supervised user whitelists. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: review Created 6 years 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
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | components/sync_driver/pref_names.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 syncer::APP_LIST, 49 syncer::APP_LIST,
50 syncer::THEMES, 50 syncer::THEMES,
51 syncer::SEARCH_ENGINES, 51 syncer::SEARCH_ENGINES,
52 syncer::SESSIONS, 52 syncer::SESSIONS,
53 syncer::APP_NOTIFICATIONS, 53 syncer::APP_NOTIFICATIONS,
54 syncer::DICTIONARY, 54 syncer::DICTIONARY,
55 syncer::FAVICON_IMAGES, 55 syncer::FAVICON_IMAGES,
56 syncer::FAVICON_TRACKING, 56 syncer::FAVICON_TRACKING,
57 syncer::SUPERVISED_USER_SETTINGS, 57 syncer::SUPERVISED_USER_SETTINGS,
58 syncer::SUPERVISED_USER_SHARED_SETTINGS, 58 syncer::SUPERVISED_USER_SHARED_SETTINGS,
59 syncer::SUPERVISED_USER_WHITELISTS,
59 syncer::ARTICLES, 60 syncer::ARTICLES,
60 syncer::WIFI_CREDENTIALS, 61 syncer::WIFI_CREDENTIALS,
61 }; 62 };
62 63
63 COMPILE_ASSERT(arraysize(kStartOrder) == 64 COMPILE_ASSERT(arraysize(kStartOrder) ==
64 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE, 65 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE,
65 kStartOrder_IncorrectSize); 66 kStartOrder_IncorrectSize);
66 67
67 // The amount of time we wait for association to finish. If some types haven't 68 // The amount of time we wait for association to finish. If some types haven't
68 // finished association by the time, DataTypeManager is notified of the 69 // finished association by the time, DataTypeManager is notified of the
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 410
410 delegate_->OnModelAssociationDone(result); 411 delegate_->OnModelAssociationDone(result);
411 } 412 }
412 413
413 base::OneShotTimer<ModelAssociationManager>* 414 base::OneShotTimer<ModelAssociationManager>*
414 ModelAssociationManager::GetTimerForTesting() { 415 ModelAssociationManager::GetTimerForTesting() {
415 return &timer_; 416 return &timer_;
416 } 417 }
417 418
418 } // namespace sync_driver 419 } // namespace sync_driver
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | components/sync_driver/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698