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

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: Fix compile on some platforms 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 19 matching lines...) Expand all
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::PRIORITY_PREFERENCES, 33 syncer::PRIORITY_PREFERENCES,
34 syncer::EXTENSIONS, 34 syncer::EXTENSIONS,
35 syncer::APPS, 35 syncer::APPS,
36 syncer::THEMES, 36 syncer::THEMES,
37 syncer::SEARCH_ENGINES, 37 syncer::SEARCH_ENGINES,
38 syncer::SESSIONS, 38 syncer::SESSIONS,
39 syncer::APP_NOTIFICATIONS, 39 syncer::APP_NOTIFICATIONS,
40 syncer::DICTIONARY,
40 syncer::AUTOFILL, // Non-UI thread datatypes. 41 syncer::AUTOFILL, // Non-UI thread datatypes.
41 syncer::AUTOFILL_PROFILE, 42 syncer::AUTOFILL_PROFILE,
42 syncer::EXTENSION_SETTINGS, 43 syncer::EXTENSION_SETTINGS,
43 syncer::APP_SETTINGS, 44 syncer::APP_SETTINGS,
44 syncer::TYPED_URLS, 45 syncer::TYPED_URLS,
45 syncer::PASSWORDS, 46 syncer::PASSWORDS,
46 syncer::HISTORY_DELETE_DIRECTIVES, 47 syncer::HISTORY_DELETE_DIRECTIVES,
47 syncer::SYNCED_NOTIFICATIONS, 48 syncer::SYNCED_NOTIFICATIONS,
48 }; 49 };
49 50
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 } 547 }
547 return result; 548 return result;
548 } 549 }
549 550
550 base::OneShotTimer<ModelAssociationManager>* 551 base::OneShotTimer<ModelAssociationManager>*
551 ModelAssociationManager::GetTimerForTesting() { 552 ModelAssociationManager::GetTimerForTesting() {
552 return &timer_; 553 return &timer_;
553 } 554 }
554 555
555 } // namespace browser_sync 556 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698