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

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

Issue 14053004: Add ManagedUserSettings Sync data type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 8 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 23 matching lines...) Expand all
34 syncer::PRIORITY_PREFERENCES, 34 syncer::PRIORITY_PREFERENCES,
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::AUTOFILL, // Non-UI thread datatypes. 45 syncer::AUTOFILL, // Non-UI thread datatypes.
45 syncer::AUTOFILL_PROFILE, 46 syncer::AUTOFILL_PROFILE,
46 syncer::EXTENSION_SETTINGS, 47 syncer::EXTENSION_SETTINGS,
47 syncer::APP_SETTINGS, 48 syncer::APP_SETTINGS,
48 syncer::TYPED_URLS, 49 syncer::TYPED_URLS,
49 syncer::PASSWORDS, 50 syncer::PASSWORDS,
50 syncer::HISTORY_DELETE_DIRECTIVES, 51 syncer::HISTORY_DELETE_DIRECTIVES,
51 syncer::SYNCED_NOTIFICATIONS, 52 syncer::SYNCED_NOTIFICATIONS,
52 }; 53 };
53 54
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 } 552 }
552 return result; 553 return result;
553 } 554 }
554 555
555 base::OneShotTimer<ModelAssociationManager>* 556 base::OneShotTimer<ModelAssociationManager>*
556 ModelAssociationManager::GetTimerForTesting() { 557 ModelAssociationManager::GetTimerForTesting() {
557 return &timer_; 558 return &timer_;
558 } 559 }
559 560
560 } // namespace browser_sync 561 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698