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

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

Issue 8957001: [Sync] Remove ModelChangingSyncerCommand::HasCustomGroups() (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/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 return true;
19 }
20
21 std::set<ModelSafeGroup> ResolveConflictsCommand::GetGroupsToChange( 17 std::set<ModelSafeGroup> ResolveConflictsCommand::GetGroupsToChange(
22 const sessions::SyncSession& session) const { 18 const sessions::SyncSession& session) const {
23 return session.GetEnabledGroupsWithConflicts(); 19 return session.GetEnabledGroupsWithConflicts();
24 } 20 }
25 21
26 void ResolveConflictsCommand::ModelChangingExecuteImpl( 22 void ResolveConflictsCommand::ModelChangingExecuteImpl(
27 sessions::SyncSession* session) { 23 sessions::SyncSession* session) {
28 ConflictResolver* resolver = session->context()->resolver(); 24 ConflictResolver* resolver = session->context()->resolver();
29 DCHECK(resolver); 25 DCHECK(resolver);
30 if (!resolver) 26 if (!resolver)
31 return; 27 return;
32 28
33 syncable::ScopedDirLookup dir(session->context()->directory_manager(), 29 syncable::ScopedDirLookup dir(session->context()->directory_manager(),
34 session->context()->account_name()); 30 session->context()->account_name());
35 if (!dir.good()) 31 if (!dir.good())
36 return; 32 return;
37 sessions::StatusController* status = session->mutable_status_controller(); 33 sessions::StatusController* status = session->mutable_status_controller();
38 const sessions::ConflictProgress* progress = status->conflict_progress(); 34 const sessions::ConflictProgress* progress = status->conflict_progress();
39 if (!progress) 35 if (!progress)
40 return; // Nothing to do. 36 return; // Nothing to do.
41 status->update_conflicts_resolved( 37 status->update_conflicts_resolved(
42 resolver->ResolveConflicts(dir, *progress, status)); 38 resolver->ResolveConflicts(dir, *progress, status));
43 } 39 }
44 40
45 } // namespace browser_sync 41 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/engine/resolve_conflicts_command.h ('k') | chrome/browser/sync/engine/verify_updates_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698