| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 "chrome/browser/sync/engine/syncer.h" | 10 #include "chrome/browser/sync/engine/syncer.h" |
| 11 #include "chrome/browser/sync/engine/syncer_proto_util.h" | 11 #include "chrome/browser/sync/engine/syncer_proto_util.h" |
| 12 #include "chrome/browser/sync/engine/syncer_session.h" | 12 #include "chrome/browser/sync/engine/syncer_session.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/syncable/directory_manager.h" | 15 #include "chrome/browser/sync/syncable/directory_manager.h" |
| 16 #include "chrome/browser/sync/syncable/syncable.h" | 16 #include "chrome/browser/sync/syncable/syncable.h" |
| 17 #include "chrome/browser/sync/util/character_set_converters.h" | |
| 18 | 17 |
| 19 using std::vector; | 18 using std::vector; |
| 20 | 19 |
| 21 namespace browser_sync { | 20 namespace browser_sync { |
| 22 | 21 |
| 23 ProcessUpdatesCommand::ProcessUpdatesCommand() {} | 22 ProcessUpdatesCommand::ProcessUpdatesCommand() {} |
| 24 ProcessUpdatesCommand::~ProcessUpdatesCommand() {} | 23 ProcessUpdatesCommand::~ProcessUpdatesCommand() {} |
| 25 | 24 |
| 26 void ProcessUpdatesCommand::ModelChangingExecuteImpl(SyncerSession* session) { | 25 void ProcessUpdatesCommand::ModelChangingExecuteImpl(SyncerSession* session) { |
| 27 syncable::ScopedDirLookup dir(session->dirman(), session->account_name()); | 26 syncable::ScopedDirLookup dir(session->dirman(), session->account_name()); |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 153 |
| 155 if (update_entry.Get(SERVER_VERSION) == update_entry.Get(BASE_VERSION) && | 154 if (update_entry.Get(SERVER_VERSION) == update_entry.Get(BASE_VERSION) && |
| 156 !update_entry.Get(IS_UNSYNCED)) { | 155 !update_entry.Get(IS_UNSYNCED)) { |
| 157 CHECK(SyncerUtil::ServerAndLocalEntriesMatch( | 156 CHECK(SyncerUtil::ServerAndLocalEntriesMatch( |
| 158 &update_entry)) << update_entry; | 157 &update_entry)) << update_entry; |
| 159 } | 158 } |
| 160 return SUCCESS_PROCESSED; | 159 return SUCCESS_PROCESSED; |
| 161 } | 160 } |
| 162 | 161 |
| 163 } // namespace browser_sync | 162 } // namespace browser_sync |
| OLD | NEW |