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

Side by Side Diff: chrome/browser/sync/engine/download_updates_command.cc

Issue 8919021: [Sync] Rename ModelEnumSet to ModelTypeSet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/sync/engine/download_updates_command.h" 5 #include "chrome/browser/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 "chrome/browser/sync/engine/syncer.h" 10 #include "chrome/browser/sync/engine/syncer.h"
11 #include "chrome/browser/sync/engine/syncer_proto_util.h" 11 #include "chrome/browser/sync/engine/syncer_proto_util.h"
12 #include "chrome/browser/sync/engine/syncproto.h" 12 #include "chrome/browser/sync/engine/syncproto.h"
13 #include "chrome/browser/sync/syncable/directory_manager.h" 13 #include "chrome/browser/sync/syncable/directory_manager.h"
14 #include "chrome/browser/sync/syncable/model_type_payload_map.h" 14 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 16
17 using syncable::ScopedDirLookup; 17 using syncable::ScopedDirLookup;
18 18
19 using sync_pb::DebugInfo; 19 using sync_pb::DebugInfo;
20 20
21 namespace browser_sync { 21 namespace browser_sync {
22 using sessions::StatusController; 22 using sessions::StatusController;
23 using sessions::SyncSession; 23 using sessions::SyncSession;
24 using std::string; 24 using std::string;
25 using syncable::FIRST_REAL_MODEL_TYPE; 25 using syncable::FIRST_REAL_MODEL_TYPE;
26 using syncable::MODEL_TYPE_COUNT; 26 using syncable::MODEL_TYPE_COUNT;
27 using syncable::ModelEnumSet; 27 using syncable::ModelTypeSet;
28 using syncable::ModelEnumSetToString; 28 using syncable::ModelTypeSetToString;
29 29
30 DownloadUpdatesCommand::DownloadUpdatesCommand() {} 30 DownloadUpdatesCommand::DownloadUpdatesCommand() {}
31 DownloadUpdatesCommand::~DownloadUpdatesCommand() {} 31 DownloadUpdatesCommand::~DownloadUpdatesCommand() {}
32 32
33 void DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) { 33 void DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
34 ClientToServerMessage client_to_server_message; 34 ClientToServerMessage client_to_server_message;
35 ClientToServerResponse update_response; 35 ClientToServerResponse update_response;
36 36
37 client_to_server_message.set_share(session->context()->account_name()); 37 client_to_server_message.set_share(session->context()->account_name());
38 client_to_server_message.set_message_contents( 38 client_to_server_message.set_message_contents(
39 ClientToServerMessage::GET_UPDATES); 39 ClientToServerMessage::GET_UPDATES);
40 GetUpdatesMessage* get_updates = 40 GetUpdatesMessage* get_updates =
41 client_to_server_message.mutable_get_updates(); 41 client_to_server_message.mutable_get_updates();
42 if (CommandLine::ForCurrentProcess()->HasSwitch( 42 if (CommandLine::ForCurrentProcess()->HasSwitch(
43 switches::kCreateMobileBookmarksFolder)) { 43 switches::kCreateMobileBookmarksFolder)) {
44 get_updates->set_include_syncable_bookmarks(true); 44 get_updates->set_include_syncable_bookmarks(true);
45 } 45 }
46 46
47 ScopedDirLookup dir(session->context()->directory_manager(), 47 ScopedDirLookup dir(session->context()->directory_manager(),
48 session->context()->account_name()); 48 session->context()->account_name());
49 if (!dir.good()) { 49 if (!dir.good()) {
50 LOG(ERROR) << "Scoped dir lookup failed!"; 50 LOG(ERROR) << "Scoped dir lookup failed!";
51 return; 51 return;
52 } 52 }
53 53
54 // Request updates for all enabled types. 54 // Request updates for all enabled types.
55 const ModelEnumSet enabled_types = 55 const ModelTypeSet enabled_types =
56 GetRoutingInfoTypes(session->routing_info()); 56 GetRoutingInfoTypes(session->routing_info());
57 DVLOG(1) << "Getting updates for types " 57 DVLOG(1) << "Getting updates for types "
58 << ModelEnumSetToString(enabled_types); 58 << ModelTypeSetToString(enabled_types);
59 DCHECK(!enabled_types.Empty()); 59 DCHECK(!enabled_types.Empty());
60 60
61 const syncable::ModelTypePayloadMap& type_payload_map = 61 const syncable::ModelTypePayloadMap& type_payload_map =
62 session->source().types; 62 session->source().types;
63 for (ModelEnumSet::Iterator it = enabled_types.First(); 63 for (ModelTypeSet::Iterator it = enabled_types.First();
64 it.Good(); it.Inc()) { 64 it.Good(); it.Inc()) {
65 sync_pb::DataTypeProgressMarker* progress_marker = 65 sync_pb::DataTypeProgressMarker* progress_marker =
66 get_updates->add_from_progress_marker(); 66 get_updates->add_from_progress_marker();
67 dir->GetDownloadProgress(it.Get(), progress_marker); 67 dir->GetDownloadProgress(it.Get(), progress_marker);
68 68
69 // Set notification hint if present. 69 // Set notification hint if present.
70 syncable::ModelTypePayloadMap::const_iterator type_payload = 70 syncable::ModelTypePayloadMap::const_iterator type_payload =
71 type_payload_map.find(it.Get()); 71 type_payload_map.find(it.Get());
72 if (type_payload != type_payload_map.end()) { 72 if (type_payload != type_payload_map.end()) {
73 progress_marker->set_notification_hint(type_payload->second); 73 progress_marker->set_notification_hint(type_payload->second);
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 if (session->context()->debug_info_getter()) { 128 if (session->context()->debug_info_getter()) {
129 session->context()->debug_info_getter()->GetAndClearDebugInfo( 129 session->context()->debug_info_getter()->GetAndClearDebugInfo(
130 debug_info); 130 debug_info);
131 } 131 }
132 session->mutable_status_controller()->set_debug_info_sent(); 132 session->mutable_status_controller()->set_debug_info_sent();
133 } 133 }
134 } 134 }
135 135
136 136
137 } // namespace browser_sync 137 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698