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

Side by Side Diff: components/sync/driver/model_association_manager.cc

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)
Patch Set: Missed a comment in a DEPS file, and rebasing. Created 4 years, 2 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/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/metrics/histogram_macros.h" 15 #include "base/metrics/histogram_macros.h"
16 #include "base/trace_event/trace_event.h" 16 #include "base/trace_event/trace_event.h"
17 #include "components/sync/api/sync_merge_result.h"
18 #include "components/sync/base/model_type.h" 17 #include "components/sync/base/model_type.h"
18 #include "components/sync/model/sync_merge_result.h"
19 19
20 namespace syncer { 20 namespace syncer {
21 21
22 namespace { 22 namespace {
23 23
24 static const ModelType kStartOrder[] = { 24 static const ModelType kStartOrder[] = {
25 NIGORI, // Listed for completeness. 25 NIGORI, // Listed for completeness.
26 DEVICE_INFO, // Listed for completeness. 26 DEVICE_INFO, // Listed for completeness.
27 EXPERIMENTS, // Listed for completeness. 27 EXPERIMENTS, // Listed for completeness.
28 PROXY_TABS, // Listed for completeness. 28 PROXY_TABS, // Listed for completeness.
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 // At least one type is not ready. 408 // At least one type is not ready.
409 return; 409 return;
410 } 410 }
411 } 411 }
412 412
413 notified_about_ready_for_configure_ = true; 413 notified_about_ready_for_configure_ = true;
414 delegate_->OnAllDataTypesReadyForConfigure(); 414 delegate_->OnAllDataTypesReadyForConfigure();
415 } 415 }
416 416
417 } // namespace syncer 417 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/driver/generic_change_processor_unittest.cc ('k') | components/sync/driver/model_associator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698