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

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

Issue 6873156: Move crypto_helpers from sync to base (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Correct headers. Created 9 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
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/syncable/syncable.h" 5 #include "chrome/browser/sync/syncable/syncable.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include <sys/stat.h> 9 #include <sys/stat.h>
10 #if defined(OS_POSIX) 10 #if defined(OS_POSIX)
(...skipping 30 matching lines...) Expand all
41 #include "chrome/browser/sync/engine/syncer_util.h" 41 #include "chrome/browser/sync/engine/syncer_util.h"
42 #include "chrome/browser/sync/protocol/proto_value_conversions.h" 42 #include "chrome/browser/sync/protocol/proto_value_conversions.h"
43 #include "chrome/browser/sync/protocol/service_constants.h" 43 #include "chrome/browser/sync/protocol/service_constants.h"
44 #include "chrome/browser/sync/syncable/directory_backing_store.h" 44 #include "chrome/browser/sync/syncable/directory_backing_store.h"
45 #include "chrome/browser/sync/syncable/directory_manager.h" 45 #include "chrome/browser/sync/syncable/directory_manager.h"
46 #include "chrome/browser/sync/syncable/model_type.h" 46 #include "chrome/browser/sync/syncable/model_type.h"
47 #include "chrome/browser/sync/syncable/syncable-inl.h" 47 #include "chrome/browser/sync/syncable/syncable-inl.h"
48 #include "chrome/browser/sync/syncable/syncable_changes_version.h" 48 #include "chrome/browser/sync/syncable/syncable_changes_version.h"
49 #include "chrome/browser/sync/syncable/syncable_columns.h" 49 #include "chrome/browser/sync/syncable/syncable_columns.h"
50 #include "chrome/browser/sync/syncable/syncable_enum_conversions.h" 50 #include "chrome/browser/sync/syncable/syncable_enum_conversions.h"
51 #include "chrome/browser/sync/util/crypto_helpers.h"
52 #include "chrome/common/deprecated/event_sys-inl.h" 51 #include "chrome/common/deprecated/event_sys-inl.h"
53 #include "net/base/escape.h" 52 #include "net/base/escape.h"
54 53
55 namespace { 54 namespace {
56 enum InvariantCheckLevel { 55 enum InvariantCheckLevel {
57 OFF = 0, 56 OFF = 0,
58 VERIFY_IN_MEMORY = 1, 57 VERIFY_IN_MEMORY = 1,
59 FULL_DB_VERIFICATION = 2 58 FULL_DB_VERIFICATION = 2
60 }; 59 };
61 60
(...skipping 1841 matching lines...) Expand 10 before | Expand all | Expand 10 after
1903 Directory::ParentIdChildIndex::iterator 1902 Directory::ParentIdChildIndex::iterator
1904 Directory::GetParentChildIndexUpperBound(const ScopedKernelLock& lock, 1903 Directory::GetParentChildIndexUpperBound(const ScopedKernelLock& lock,
1905 const Id& parent_id) { 1904 const Id& parent_id) {
1906 // The upper bound of |parent_id|'s range is the lower 1905 // The upper bound of |parent_id|'s range is the lower
1907 // bound of |++parent_id|'s range. 1906 // bound of |++parent_id|'s range.
1908 return GetParentChildIndexLowerBound(lock, 1907 return GetParentChildIndexLowerBound(lock,
1909 parent_id.GetLexicographicSuccessor()); 1908 parent_id.GetLexicographicSuccessor());
1910 } 1909 }
1911 1910
1912 } // namespace syncable 1911 } // namespace syncable
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698