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

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

Issue 11445002: Sync user's custom spellcheck dictionary (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add server-side size limit tests Created 7 years, 11 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 (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 18 matching lines...) Expand all
29 syncer::DEVICE_INFO, // Listed for completeness. 29 syncer::DEVICE_INFO, // Listed for completeness.
30 syncer::EXPERIMENTS, // Listed for completeness. 30 syncer::EXPERIMENTS, // Listed for completeness.
31 syncer::BOOKMARKS, // UI thread datatypes. 31 syncer::BOOKMARKS, // UI thread datatypes.
32 syncer::PREFERENCES, 32 syncer::PREFERENCES,
33 syncer::EXTENSIONS, 33 syncer::EXTENSIONS,
34 syncer::APPS, 34 syncer::APPS,
35 syncer::THEMES, 35 syncer::THEMES,
36 syncer::SEARCH_ENGINES, 36 syncer::SEARCH_ENGINES,
37 syncer::SESSIONS, 37 syncer::SESSIONS,
38 syncer::APP_NOTIFICATIONS, 38 syncer::APP_NOTIFICATIONS,
39 syncer::DICTIONARY,
39 syncer::AUTOFILL, // Non-UI thread datatypes. 40 syncer::AUTOFILL, // Non-UI thread datatypes.
40 syncer::AUTOFILL_PROFILE, 41 syncer::AUTOFILL_PROFILE,
41 syncer::EXTENSION_SETTINGS, 42 syncer::EXTENSION_SETTINGS,
42 syncer::APP_SETTINGS, 43 syncer::APP_SETTINGS,
43 syncer::TYPED_URLS, 44 syncer::TYPED_URLS,
44 syncer::PASSWORDS, 45 syncer::PASSWORDS,
45 syncer::HISTORY_DELETE_DIRECTIVES, 46 syncer::HISTORY_DELETE_DIRECTIVES,
46 syncer::SYNCED_NOTIFICATIONS, 47 syncer::SYNCED_NOTIFICATIONS,
47 }; 48 };
48 49
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 } 546 }
546 return result; 547 return result;
547 } 548 }
548 549
549 base::OneShotTimer<ModelAssociationManager>* 550 base::OneShotTimer<ModelAssociationManager>*
550 ModelAssociationManager::GetTimerForTesting() { 551 ModelAssociationManager::GetTimerForTesting() {
551 return &timer_; 552 return &timer_;
552 } 553 }
553 554
554 } // namespace browser_sync 555 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698