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

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

Issue 8510079: sync: Remove ModelNeutralExecuteImpl() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bug that caused integration test failures Created 9 years, 1 month 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/process_updates_command.h" 5 #include "chrome/browser/sync/engine/process_updates_command.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "chrome/browser/sync/engine/syncer.h" 11 #include "chrome/browser/sync/engine/syncer.h"
12 #include "chrome/browser/sync/engine/syncer_proto_util.h" 12 #include "chrome/browser/sync/engine/syncer_proto_util.h"
13 #include "chrome/browser/sync/engine/syncer_util.h" 13 #include "chrome/browser/sync/engine/syncer_util.h"
14 #include "chrome/browser/sync/engine/syncproto.h" 14 #include "chrome/browser/sync/engine/syncproto.h"
15 #include "chrome/browser/sync/sessions/sync_session.h" 15 #include "chrome/browser/sync/sessions/sync_session.h"
16 #include "chrome/browser/sync/syncable/directory_manager.h" 16 #include "chrome/browser/sync/syncable/directory_manager.h"
17 #include "chrome/browser/sync/syncable/syncable.h" 17 #include "chrome/browser/sync/syncable/syncable.h"
18 18
19 using std::vector; 19 using std::vector;
20 20
21 namespace browser_sync { 21 namespace browser_sync {
22 22
23 using sessions::SyncSession; 23 using sessions::SyncSession;
24 using sessions::StatusController; 24 using sessions::StatusController;
25 25
26 ProcessUpdatesCommand::ProcessUpdatesCommand() {} 26 ProcessUpdatesCommand::ProcessUpdatesCommand() {}
27 ProcessUpdatesCommand::~ProcessUpdatesCommand() {} 27 ProcessUpdatesCommand::~ProcessUpdatesCommand() {}
28 28
29 bool ProcessUpdatesCommand::ModelNeutralExecuteImpl(SyncSession* session) {
30 const GetUpdatesResponse& updates =
31 session->status_controller()->updates_response().get_updates();
32 const int update_count = updates.entries_size();
33
34 // Don't bother processing updates if there were none.
35 return update_count != 0;
36 }
37
38 void ProcessUpdatesCommand::ModelChangingExecuteImpl(SyncSession* session) { 29 void ProcessUpdatesCommand::ModelChangingExecuteImpl(SyncSession* session) {
39 syncable::ScopedDirLookup dir(session->context()->directory_manager(), 30 syncable::ScopedDirLookup dir(session->context()->directory_manager(),
40 session->context()->account_name()); 31 session->context()->account_name());
41 if (!dir.good()) { 32 if (!dir.good()) {
42 LOG(ERROR) << "Scoped dir lookup failed!"; 33 LOG(ERROR) << "Scoped dir lookup failed!";
43 return; 34 return;
44 } 35 }
45 36
46 StatusController* status = session->status_controller(); 37 StatusController* status = session->status_controller();
47 38
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 // Force application of this update, no matter what. 136 // Force application of this update, no matter what.
146 target_entry.Put(syncable::IS_UNAPPLIED_UPDATE, true); 137 target_entry.Put(syncable::IS_UNAPPLIED_UPDATE, true);
147 } 138 }
148 139
149 SyncerUtil::UpdateServerFieldsFromUpdate(&target_entry, update, name); 140 SyncerUtil::UpdateServerFieldsFromUpdate(&target_entry, update, name);
150 141
151 return SUCCESS_PROCESSED; 142 return SUCCESS_PROCESSED;
152 } 143 }
153 144
154 } // namespace browser_sync 145 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/process_updates_command.h ('k') | chrome/browser/sync/engine/syncer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698