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

Side by Side Diff: components/sync_driver/model_association_manager.cc

Issue 674633002: sync: add WIFI_CREDENTIALS protobuf, ModelType, and preference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@local-master
Patch Set: resolve conflicts with https://codereview.chromium.org/673983003 Created 6 years, 1 month 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/sync_driver/model_association_manager.h" 5 #include "components/sync_driver/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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 syncer::THEMES, 50 syncer::THEMES,
51 syncer::SEARCH_ENGINES, 51 syncer::SEARCH_ENGINES,
52 syncer::SESSIONS, 52 syncer::SESSIONS,
53 syncer::APP_NOTIFICATIONS, 53 syncer::APP_NOTIFICATIONS,
54 syncer::DICTIONARY, 54 syncer::DICTIONARY,
55 syncer::FAVICON_IMAGES, 55 syncer::FAVICON_IMAGES,
56 syncer::FAVICON_TRACKING, 56 syncer::FAVICON_TRACKING,
57 syncer::SUPERVISED_USER_SETTINGS, 57 syncer::SUPERVISED_USER_SETTINGS,
58 syncer::SUPERVISED_USER_SHARED_SETTINGS, 58 syncer::SUPERVISED_USER_SHARED_SETTINGS,
59 syncer::ARTICLES, 59 syncer::ARTICLES,
60 syncer::WIFI_CREDENTIALS,
60 }; 61 };
61 62
62 COMPILE_ASSERT(arraysize(kStartOrder) == 63 COMPILE_ASSERT(arraysize(kStartOrder) ==
63 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE, 64 syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE,
64 kStartOrder_IncorrectSize); 65 kStartOrder_IncorrectSize);
65 66
66 // The amount of time we wait for association to finish. If some types haven't 67 // The amount of time we wait for association to finish. If some types haven't
67 // finished association by the time, DataTypeManager is notified of the 68 // finished association by the time, DataTypeManager is notified of the
68 // unfinished types. 69 // unfinished types.
69 const int64 kAssociationTimeOutInSeconds = 600; 70 const int64 kAssociationTimeOutInSeconds = 600;
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 409
409 delegate_->OnModelAssociationDone(result); 410 delegate_->OnModelAssociationDone(result);
410 } 411 }
411 412
412 base::OneShotTimer<ModelAssociationManager>* 413 base::OneShotTimer<ModelAssociationManager>*
413 ModelAssociationManager::GetTimerForTesting() { 414 ModelAssociationManager::GetTimerForTesting() {
414 return &timer_; 415 return &timer_;
415 } 416 }
416 417
417 } // namespace sync_driver 418 } // namespace sync_driver
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698