blob: 6caf9b42033ac31d372f3324e111b4a5a8034c97 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/sync/engine/resolve_conflicts_command.h"
#include "chrome/browser/sync/engine/conflict_resolver.h"
#include "chrome/browser/sync/engine/syncer_session.h"
#include "chrome/browser/sync/syncable/directory_manager.h"
namespace browser_sync {
ResolveConflictsCommand::ResolveConflictsCommand() {}
ResolveConflictsCommand::~ResolveConflictsCommand() {}
void ResolveConflictsCommand::ModelChangingExecuteImpl(
SyncerSession* session) {
if (!session->resolver())
return;
syncable::ScopedDirLookup dir(session->dirman(), session->account_name());
if (!dir.good())
return;
ConflictResolutionView conflict_view(session);
session->set_conflicts_resolved(
session->resolver()->ResolveConflicts(dir, &conflict_view, session));
}
} // namespace browser_sync
|
