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

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

Issue 8785015: Revert 112815 - [Sync] Make syncer commands avoid posting tasks on threads with no work to do (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/build_and_process_conflict_sets_command.h" 5 #include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <sstream> 9 #include <sstream>
10 #include <vector> 10 #include <vector>
(...skipping 12 matching lines...) Expand all
23 using sessions::StatusController; 23 using sessions::StatusController;
24 using sessions::SyncSession; 24 using sessions::SyncSession;
25 using sessions::UpdateProgress; 25 using sessions::UpdateProgress;
26 using std::set; 26 using std::set;
27 using std::string; 27 using std::string;
28 using std::vector; 28 using std::vector;
29 29
30 BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSetsCommand() {} 30 BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSetsCommand() {}
31 BuildAndProcessConflictSetsCommand::~BuildAndProcessConflictSetsCommand() {} 31 BuildAndProcessConflictSetsCommand::~BuildAndProcessConflictSetsCommand() {}
32 32
33 std::set<ModelSafeGroup> BuildAndProcessConflictSetsCommand::GetGroupsToChange(
34 const sessions::SyncSession& session) const {
35 return session.GetEnabledGroupsWithConflicts();
36 }
37
38 void BuildAndProcessConflictSetsCommand::ModelChangingExecuteImpl( 33 void BuildAndProcessConflictSetsCommand::ModelChangingExecuteImpl(
39 SyncSession* session) { 34 SyncSession* session) {
40 session->mutable_status_controller()->update_conflict_sets_built( 35 session->mutable_status_controller()->update_conflict_sets_built(
41 BuildAndProcessConflictSets(session)); 36 BuildAndProcessConflictSets(session));
42 } 37 }
43 38
44 bool BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSets( 39 bool BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSets(
45 SyncSession* session) { 40 SyncSession* session) {
46 syncable::ScopedDirLookup dir(session->context()->directory_manager(), 41 syncable::ScopedDirLookup dir(session->context()->directory_manager(),
47 session->context()->account_name()); 42 session->context()->account_name());
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 LocallyDeletedPathChecker checker; 405 LocallyDeletedPathChecker checker;
411 if (!checker.CausingConflict(parent, *entry)) 406 if (!checker.CausingConflict(parent, *entry))
412 return; 407 return;
413 conflict_progress->MergeSets(entry->Get(syncable::ID), 408 conflict_progress->MergeSets(entry->Get(syncable::ID),
414 parent.Get(syncable::ID)); 409 parent.Get(syncable::ID));
415 CrawlDeletedTreeMergingSets(trans, parent, conflict_progress, checker); 410 CrawlDeletedTreeMergingSets(trans, parent, conflict_progress, checker);
416 } 411 }
417 } 412 }
418 413
419 } // namespace browser_sync 414 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698