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

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

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1
Patch Set: Rebase. Created 4 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
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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
11 #include <functional> 11 #include <functional>
12 12
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/metrics/histogram_macros.h" 16 #include "base/metrics/histogram_macros.h"
17 #include "base/trace_event/trace_event.h" 17 #include "base/trace_event/trace_event.h"
18 #include "sync/api/sync_merge_result.h" 18 #include "components/sync/api/sync_merge_result.h"
19 #include "sync/internal_api/public/base/model_type.h" 19 #include "components/sync/base/model_type.h"
20 20
21 using syncer::ModelTypeSet; 21 using syncer::ModelTypeSet;
22 22
23 namespace sync_driver { 23 namespace sync_driver {
24 24
25 namespace { 25 namespace {
26 26
27 static const syncer::ModelType kStartOrder[] = { 27 static const syncer::ModelType kStartOrder[] = {
28 syncer::NIGORI, // Listed for completeness. 28 syncer::NIGORI, // Listed for completeness.
29 syncer::DEVICE_INFO, // Listed for completeness. 29 syncer::DEVICE_INFO, // Listed for completeness.
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 // At least one type is not ready. 453 // At least one type is not ready.
454 return; 454 return;
455 } 455 }
456 } 456 }
457 457
458 notified_about_ready_for_configure_ = true; 458 notified_about_ready_for_configure_ = true;
459 delegate_->OnAllDataTypesReadyForConfigure(); 459 delegate_->OnAllDataTypesReadyForConfigure();
460 } 460 }
461 461
462 } // namespace sync_driver 462 } // namespace sync_driver
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698