OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/data_type_manager_impl.h" | 5 #include "chrome/browser/sync/glue/data_type_manager_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <functional> | 8 #include <functional> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 namespace browser_sync { | 24 namespace browser_sync { |
25 | 25 |
26 namespace { | 26 namespace { |
27 | 27 |
28 static const syncable::ModelType kStartOrder[] = { | 28 static const syncable::ModelType kStartOrder[] = { |
29 syncable::NIGORI, // Listed for completeness. | 29 syncable::NIGORI, // Listed for completeness. |
30 syncable::BOOKMARKS, | 30 syncable::BOOKMARKS, |
31 syncable::PREFERENCES, | 31 syncable::PREFERENCES, |
32 syncable::AUTOFILL, | 32 syncable::AUTOFILL, |
33 syncable::AUTOFILL_PROFILE, | 33 syncable::AUTOFILL_PROFILE, |
| 34 syncable::EXTENSION_SETTINGS, |
34 syncable::EXTENSIONS, | 35 syncable::EXTENSIONS, |
35 syncable::APPS, | 36 syncable::APPS, |
36 syncable::THEMES, | 37 syncable::THEMES, |
37 syncable::TYPED_URLS, | 38 syncable::TYPED_URLS, |
38 syncable::PASSWORDS, | 39 syncable::PASSWORDS, |
39 syncable::SEARCH_ENGINES, | 40 syncable::SEARCH_ENGINES, |
40 syncable::SESSIONS, | 41 syncable::SESSIONS, |
41 }; | 42 }; |
42 | 43 |
43 COMPILE_ASSERT(arraysize(kStartOrder) == | 44 COMPILE_ASSERT(arraysize(kStartOrder) == |
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
491 Source<DataTypeManager>(this), | 492 Source<DataTypeManager>(this), |
492 NotificationService::NoDetails()); | 493 NotificationService::NoDetails()); |
493 } | 494 } |
494 | 495 |
495 void DataTypeManagerImpl::AddToConfigureTime() { | 496 void DataTypeManagerImpl::AddToConfigureTime() { |
496 DCHECK(!last_restart_time_.is_null()); | 497 DCHECK(!last_restart_time_.is_null()); |
497 configure_time_delta_ += (base::Time::Now() - last_restart_time_); | 498 configure_time_delta_ += (base::Time::Now() - last_restart_time_); |
498 } | 499 } |
499 | 500 |
500 } // namespace browser_sync | 501 } // namespace browser_sync |
OLD | NEW |