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

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

Issue 10825137: FYI: Control Data + Per-Device Metadata (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add PER_USER_METADATA, refactor some encryption code Created 8 years, 4 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 <algorithm> 5 #include <algorithm>
6 #include <functional> 6 #include <functional>
7 7
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 19 matching lines...) Expand all
30 namespace browser_sync { 30 namespace browser_sync {
31 // The amount of time we wait for a datatype to load. If the type has 31 // The amount of time we wait for a datatype to load. If the type has
32 // not finished loading we move on to the next type. Once this type 32 // not finished loading we move on to the next type. Once this type
33 // finishes loading we will do a configure to associate this type. Note 33 // finishes loading we will do a configure to associate this type. Note
34 // that in most cases types finish loading before this timeout. 34 // that in most cases types finish loading before this timeout.
35 const int64 kDataTypeLoadWaitTimeInSeconds = 120; 35 const int64 kDataTypeLoadWaitTimeInSeconds = 120;
36 namespace { 36 namespace {
37 37
38 static const syncer::ModelType kStartOrder[] = { 38 static const syncer::ModelType kStartOrder[] = {
39 syncer::NIGORI, // Listed for completeness. 39 syncer::NIGORI, // Listed for completeness.
40 syncer::PER_DEVICE_METADATA, // Listed for completeness.
41 syncer::PER_USER_METADATA, // Listed for completeness.
40 syncer::BOOKMARKS, // UI thread datatypes. 42 syncer::BOOKMARKS, // UI thread datatypes.
41 syncer::PREFERENCES, 43 syncer::PREFERENCES,
42 syncer::EXTENSIONS, 44 syncer::EXTENSIONS,
43 syncer::APPS, 45 syncer::APPS,
44 syncer::THEMES, 46 syncer::THEMES,
45 syncer::SEARCH_ENGINES, 47 syncer::SEARCH_ENGINES,
46 syncer::SESSIONS, 48 syncer::SESSIONS,
47 syncer::APP_NOTIFICATIONS, 49 syncer::APP_NOTIFICATIONS,
48 syncer::AUTOFILL, // Non-UI thread datatypes. 50 syncer::AUTOFILL, // Non-UI thread datatypes.
49 syncer::AUTOFILL_PROFILE, 51 syncer::AUTOFILL_PROFILE,
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 } 503 }
502 return result; 504 return result;
503 } 505 }
504 506
505 base::OneShotTimer<ModelAssociationManager>* 507 base::OneShotTimer<ModelAssociationManager>*
506 ModelAssociationManager::GetTimerForTesting() { 508 ModelAssociationManager::GetTimerForTesting() {
507 return &timer_; 509 return &timer_;
508 } 510 }
509 511
510 } // namespace browser_sync 512 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698