| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "sync/engine/download_updates_command.h" | 5 #include "sync/engine/download_updates_command.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "sync/engine/syncer.h" | 10 #include "sync/engine/syncer.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 const ModelTypeSet enabled_types = | 70 const ModelTypeSet enabled_types = |
| 71 GetRoutingInfoTypes(session->routing_info()); | 71 GetRoutingInfoTypes(session->routing_info()); |
| 72 DVLOG(1) << "Getting updates for types " | 72 DVLOG(1) << "Getting updates for types " |
| 73 << ModelTypeSetToString(enabled_types); | 73 << ModelTypeSetToString(enabled_types); |
| 74 DCHECK(!enabled_types.Empty()); | 74 DCHECK(!enabled_types.Empty()); |
| 75 | 75 |
| 76 const ModelTypeInvalidationMap& invalidation_map = | 76 const ModelTypeInvalidationMap& invalidation_map = |
| 77 session->source().types; | 77 session->source().types; |
| 78 for (ModelTypeSet::Iterator it = enabled_types.First(); | 78 for (ModelTypeSet::Iterator it = enabled_types.First(); |
| 79 it.Good(); it.Inc()) { | 79 it.Good(); it.Inc()) { |
| 80 if (ProxyTypes().Has(it.Get())) |
| 81 continue; |
| 80 sync_pb::DataTypeProgressMarker* progress_marker = | 82 sync_pb::DataTypeProgressMarker* progress_marker = |
| 81 get_updates->add_from_progress_marker(); | 83 get_updates->add_from_progress_marker(); |
| 82 dir->GetDownloadProgress(it.Get(), progress_marker); | 84 dir->GetDownloadProgress(it.Get(), progress_marker); |
| 83 | 85 |
| 84 // Set notification hint if present. | 86 // Set notification hint if present. |
| 85 ModelTypeInvalidationMap::const_iterator find_it = | 87 ModelTypeInvalidationMap::const_iterator find_it = |
| 86 invalidation_map.find(it.Get()); | 88 invalidation_map.find(it.Get()); |
| 87 if (find_it != invalidation_map.end()) { | 89 if (find_it != invalidation_map.end()) { |
| 88 progress_marker->set_notification_hint(find_it->second.payload); | 90 progress_marker->set_notification_hint(find_it->second.payload); |
| 89 } | 91 } |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 // could be null in some unit tests. | 159 // could be null in some unit tests. |
| 158 if (session->context()->debug_info_getter()) { | 160 if (session->context()->debug_info_getter()) { |
| 159 session->context()->debug_info_getter()->GetAndClearDebugInfo( | 161 session->context()->debug_info_getter()->GetAndClearDebugInfo( |
| 160 debug_info); | 162 debug_info); |
| 161 } | 163 } |
| 162 session->mutable_status_controller()->set_debug_info_sent(); | 164 session->mutable_status_controller()->set_debug_info_sent(); |
| 163 } | 165 } |
| 164 } | 166 } |
| 165 | 167 |
| 166 } // namespace syncer | 168 } // namespace syncer |
| OLD | NEW |