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

Side by Side Diff: chrome/browser/sync/glue/model_association_manager.cc

Issue 15177003: Add Sync data type for managed users. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 7 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 | 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 4
5 #include "chrome/browser/sync/glue/model_association_manager.h" 5 #include "chrome/browser/sync/glue/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 24 matching lines...) Expand all
35 syncer::EXTENSIONS, 35 syncer::EXTENSIONS,
36 syncer::APPS, 36 syncer::APPS,
37 syncer::THEMES, 37 syncer::THEMES,
38 syncer::SEARCH_ENGINES, 38 syncer::SEARCH_ENGINES,
39 syncer::SESSIONS, 39 syncer::SESSIONS,
40 syncer::APP_NOTIFICATIONS, 40 syncer::APP_NOTIFICATIONS,
41 syncer::DICTIONARY, 41 syncer::DICTIONARY,
42 syncer::FAVICON_IMAGES, 42 syncer::FAVICON_IMAGES,
43 syncer::FAVICON_TRACKING, 43 syncer::FAVICON_TRACKING,
44 syncer::MANAGED_USER_SETTINGS, 44 syncer::MANAGED_USER_SETTINGS,
45 syncer::MANAGED_USERS,
tim (not reviewing) 2013/05/23 18:23:27 Since association for each of these types happens
Bernhard Bauer 2013/05/23 20:08:17 Done.
45 syncer::AUTOFILL, // Non-UI thread datatypes. 46 syncer::AUTOFILL, // Non-UI thread datatypes.
46 syncer::AUTOFILL_PROFILE, 47 syncer::AUTOFILL_PROFILE,
47 syncer::EXTENSION_SETTINGS, 48 syncer::EXTENSION_SETTINGS,
48 syncer::APP_SETTINGS, 49 syncer::APP_SETTINGS,
49 syncer::TYPED_URLS, 50 syncer::TYPED_URLS,
50 syncer::PASSWORDS, 51 syncer::PASSWORDS,
51 syncer::HISTORY_DELETE_DIRECTIVES, 52 syncer::HISTORY_DELETE_DIRECTIVES,
52 syncer::SYNCED_NOTIFICATIONS, 53 syncer::SYNCED_NOTIFICATIONS,
53 }; 54 };
54 55
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 } 578 }
578 return result; 579 return result;
579 } 580 }
580 581
581 base::OneShotTimer<ModelAssociationManager>* 582 base::OneShotTimer<ModelAssociationManager>*
582 ModelAssociationManager::GetTimerForTesting() { 583 ModelAssociationManager::GetTimerForTesting() {
583 return &timer_; 584 return &timer_;
584 } 585 }
585 586
586 } // namespace browser_sync 587 } // namespace browser_sync
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service.cc » ('j') | sync/internal_api/public/base/model_type.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698