OLD | NEW |
---|---|
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 "build/build_config.h" | 5 #include "build/build_config.h" |
6 | 6 |
7 #include "chrome/browser/sync/glue/sync_backend_host.h" | 7 #include "chrome/browser/sync/glue/sync_backend_host.h" |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <map> | 10 #include <map> |
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
676 // downloaded if they are enabled. | 676 // downloaded if they are enabled. |
677 // | 677 // |
678 // The SyncBackendRegistrar's state was initially derived from the types | 678 // The SyncBackendRegistrar's state was initially derived from the types |
679 // detected to have been downloaded in the database. Afterwards it is | 679 // detected to have been downloaded in the database. Afterwards it is |
680 // modified only by this function. We expect it to remain in sync with the | 680 // modified only by this function. We expect it to remain in sync with the |
681 // backend because configuration requests are never aborted; they are retried | 681 // backend because configuration requests are never aborted; they are retried |
682 // until they succeed or the backend is shut down. | 682 // until they succeed or the backend is shut down. |
683 | 683 |
684 syncer::ModelTypeSet types_to_download = registrar_->ConfigureDataTypes( | 684 syncer::ModelTypeSet types_to_download = registrar_->ConfigureDataTypes( |
685 types_to_add, types_to_remove); | 685 types_to_add, types_to_remove); |
686 types_to_download.RemoveAll(syncer::LocalTypes()); | |
tim (not reviewing)
2013/01/18 20:56:33
It looks like most of this CL is actually removing
Nicolas Zea
2013/01/19 00:03:13
How do you mean? If we're passing information via
| |
686 if (!types_to_download.Empty()) | 687 if (!types_to_download.Empty()) |
687 types_to_download.Put(syncer::NIGORI); | 688 types_to_download.Put(syncer::NIGORI); |
688 | 689 |
689 // TODO(sync): crbug.com/137550. | 690 // TODO(sync): crbug.com/137550. |
690 // It's dangerous to configure types that have progress markers. Types with | 691 // It's dangerous to configure types that have progress markers. Types with |
691 // progress markers can trigger a MIGRATION_DONE response. We are not | 692 // progress markers can trigger a MIGRATION_DONE response. We are not |
692 // prepared to handle a migration during a configure, so we must ensure that | 693 // prepared to handle a migration during a configure, so we must ensure that |
693 // all our types_to_download actually contain no data before we sync them. | 694 // all our types_to_download actually contain no data before we sync them. |
694 // | 695 // |
695 // One common way to end up in this situation used to be types which | 696 // One common way to end up in this situation used to be types which |
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1605 DVLOG(1) << "Connection status changed: " | 1606 DVLOG(1) << "Connection status changed: " |
1606 << syncer::ConnectionStatusToString(status); | 1607 << syncer::ConnectionStatusToString(status); |
1607 frontend_->OnConnectionStatusChange(status); | 1608 frontend_->OnConnectionStatusChange(status); |
1608 } | 1609 } |
1609 | 1610 |
1610 #undef SDVLOG | 1611 #undef SDVLOG |
1611 | 1612 |
1612 #undef SLOG | 1613 #undef SLOG |
1613 | 1614 |
1614 } // namespace browser_sync | 1615 } // namespace browser_sync |
OLD | NEW |