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

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

Issue 8637006: [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: Sync to head, fix windows compile 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/resolve_conflicts_command.h" 5 #include "chrome/browser/sync/engine/resolve_conflicts_command.h"
6 6
7 #include "chrome/browser/sync/engine/conflict_resolver.h" 7 #include "chrome/browser/sync/engine/conflict_resolver.h"
8 #include "chrome/browser/sync/sessions/session_state.h" 8 #include "chrome/browser/sync/sessions/session_state.h"
9 #include "chrome/browser/sync/sessions/sync_session.h" 9 #include "chrome/browser/sync/sessions/sync_session.h"
10 #include "chrome/browser/sync/syncable/directory_manager.h" 10 #include "chrome/browser/sync/syncable/directory_manager.h"
11 11
12 namespace browser_sync { 12 namespace browser_sync {
13 13
14 ResolveConflictsCommand::ResolveConflictsCommand() {} 14 ResolveConflictsCommand::ResolveConflictsCommand() {}
15 ResolveConflictsCommand::~ResolveConflictsCommand() {} 15 ResolveConflictsCommand::~ResolveConflictsCommand() {}
16 16
17 bool ResolveConflictsCommand::HasCustomGroupsToChange() const {
18 // TODO(akalin): Set to true.
19 return false;
20 }
21
22 std::set<ModelSafeGroup> ResolveConflictsCommand::GetGroupsToChange(
23 const sessions::SyncSession& session) const {
24 return session.GetEnabledGroupsWithConflicts();
25 }
26
17 void ResolveConflictsCommand::ModelChangingExecuteImpl( 27 void ResolveConflictsCommand::ModelChangingExecuteImpl(
18 sessions::SyncSession* session) { 28 sessions::SyncSession* session) {
19 ConflictResolver* resolver = session->context()->resolver(); 29 ConflictResolver* resolver = session->context()->resolver();
20 DCHECK(resolver); 30 DCHECK(resolver);
21 if (!resolver) 31 if (!resolver)
22 return; 32 return;
23 33
24 syncable::ScopedDirLookup dir(session->context()->directory_manager(), 34 syncable::ScopedDirLookup dir(session->context()->directory_manager(),
25 session->context()->account_name()); 35 session->context()->account_name());
26 if (!dir.good()) 36 if (!dir.good())
27 return; 37 return;
28 sessions::StatusController* status = session->mutable_status_controller(); 38 sessions::StatusController* status = session->mutable_status_controller();
29 const sessions::ConflictProgress* progress = status->conflict_progress(); 39 const sessions::ConflictProgress* progress = status->conflict_progress();
30 if (!progress) 40 if (!progress)
31 return; // Nothing to do. 41 return; // Nothing to do.
32 status->update_conflicts_resolved( 42 status->update_conflicts_resolved(
33 resolver->ResolveConflicts(dir, *progress, status)); 43 resolver->ResolveConflicts(dir, *progress, status));
34 } 44 }
35 45
36 } // namespace browser_sync 46 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698