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

Side by Side Diff: sync/syncable/syncable.cc

Issue 10398051: [Sync] Replace TalkMediator*/MediatorThread* with PushClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments, fix test Created 8 years, 7 months 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
« no previous file with comments | « sync/syncable/directory_backing_store.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "sync/syncable/syncable.h" 5 #include "sync/syncable/syncable.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cstring> 8 #include <cstring>
9 #include <functional> 9 #include <functional>
10 #include <iomanip> 10 #include <iomanip>
(...skipping 12 matching lines...) Expand all
23 #include "base/logging.h" 23 #include "base/logging.h"
24 #include "base/memory/scoped_ptr.h" 24 #include "base/memory/scoped_ptr.h"
25 #include "base/perftimer.h" 25 #include "base/perftimer.h"
26 #include "base/stl_util.h" 26 #include "base/stl_util.h"
27 #include "base/string_number_conversions.h" 27 #include "base/string_number_conversions.h"
28 #include "base/string_util.h" 28 #include "base/string_util.h"
29 #include "base/time.h" 29 #include "base/time.h"
30 #include "base/utf_string_conversions.h" 30 #include "base/utf_string_conversions.h"
31 #include "base/values.h" 31 #include "base/values.h"
32 #include "sync/protocol/proto_value_conversions.h" 32 #include "sync/protocol/proto_value_conversions.h"
33 #include "sync/protocol/service_constants.h"
34 #include "sync/syncable/directory_backing_store.h" 33 #include "sync/syncable/directory_backing_store.h"
35 #include "sync/syncable/directory_change_delegate.h" 34 #include "sync/syncable/directory_change_delegate.h"
36 #include "sync/syncable/in_memory_directory_backing_store.h" 35 #include "sync/syncable/in_memory_directory_backing_store.h"
37 #include "sync/syncable/model_type.h" 36 #include "sync/syncable/model_type.h"
38 #include "sync/syncable/on_disk_directory_backing_store.h" 37 #include "sync/syncable/on_disk_directory_backing_store.h"
39 #include "sync/syncable/syncable-inl.h" 38 #include "sync/syncable/syncable-inl.h"
40 #include "sync/syncable/syncable_changes_version.h" 39 #include "sync/syncable/syncable_changes_version.h"
41 #include "sync/syncable/syncable_columns.h" 40 #include "sync/syncable/syncable_columns.h"
42 #include "sync/syncable/syncable_enum_conversions.h" 41 #include "sync/syncable/syncable_enum_conversions.h"
43 #include "sync/syncable/transaction_observer.h" 42 #include "sync/syncable/transaction_observer.h"
(...skipping 2381 matching lines...) Expand 10 before | Expand all | Expand 10 after
2425 // We just need a shallow update to |entry|'s fields since it is already 2424 // We just need a shallow update to |entry|'s fields since it is already
2426 // self looped. 2425 // self looped.
2427 entry->Put(NEXT_ID, new_id); 2426 entry->Put(NEXT_ID, new_id);
2428 entry->Put(PREV_ID, new_id); 2427 entry->Put(PREV_ID, new_id);
2429 } else { 2428 } else {
2430 entry->PutPredecessor(entry->Get(PREV_ID)); 2429 entry->PutPredecessor(entry->Get(PREV_ID));
2431 } 2430 }
2432 } 2431 }
2433 2432
2434 } // namespace syncable 2433 } // namespace syncable
OLDNEW
« no previous file with comments | « sync/syncable/directory_backing_store.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698