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_commit_response_command.h" | 5 #include "chrome/browser/sync/engine/process_commit_response_command.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.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_status.h" | 13 #include "chrome/browser/sync/engine/syncer_status.h" |
14 #include "chrome/browser/sync/engine/syncer_util.h" | 14 #include "chrome/browser/sync/engine/syncer_util.h" |
15 #include "chrome/browser/sync/engine/syncproto.h" | 15 #include "chrome/browser/sync/engine/syncproto.h" |
16 #include "chrome/browser/sync/syncable/directory_manager.h" | 16 #include "chrome/browser/sync/syncable/directory_manager.h" |
17 #include "chrome/browser/sync/syncable/syncable.h" | 17 #include "chrome/browser/sync/syncable/syncable.h" |
18 #include "chrome/browser/sync/util/character_set_converters.h" | |
19 | 18 |
20 using syncable::ScopedDirLookup; | 19 using syncable::ScopedDirLookup; |
21 using syncable::WriteTransaction; | 20 using syncable::WriteTransaction; |
22 using syncable::MutableEntry; | 21 using syncable::MutableEntry; |
23 using syncable::Entry; | 22 using syncable::Entry; |
24 using syncable::Name; | 23 using syncable::Name; |
25 using syncable::SyncName; | 24 using syncable::SyncName; |
26 using syncable::DBName; | 25 using syncable::DBName; |
27 | 26 |
28 using std::set; | 27 using std::set; |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 | 371 |
373 LOG(INFO) << "Server commit moved aside entry: " << old_name.db_value() | 372 LOG(INFO) << "Server commit moved aside entry: " << old_name.db_value() |
374 << " to new name " << db_name; | 373 << " to new name " << db_name; |
375 | 374 |
376 // Should be safe since we're in a "commit lock." | 375 // Should be safe since we're in a "commit lock." |
377 local_entry->PutName(Name::FromDBNameAndSyncName(db_name, server_name)); | 376 local_entry->PutName(Name::FromDBNameAndSyncName(db_name, server_name)); |
378 } | 377 } |
379 } | 378 } |
380 | 379 |
381 } // namespace browser_sync | 380 } // namespace browser_sync |
OLD | NEW |