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

Side by Side Diff: sync/engine/get_commit_ids_command.h

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 5 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/engine/download_updates_command_unittest.cc ('k') | sync/engine/get_commit_ids_command.cc » ('j') | 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 #ifndef SYNC_ENGINE_GET_COMMIT_IDS_COMMAND_H_ 5 #ifndef SYNC_ENGINE_GET_COMMIT_IDS_COMMAND_H_
6 #define SYNC_ENGINE_GET_COMMIT_IDS_COMMAND_H_ 6 #define SYNC_ENGINE_GET_COMMIT_IDS_COMMAND_H_
7 #pragma once 7 #pragma once
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // are ready to commit. 52 // are ready to commit.
53 // An entry is not considered ready for commit if any are true: 53 // An entry is not considered ready for commit if any are true:
54 // 1. It's in conflict. 54 // 1. It's in conflict.
55 // 2. It requires encryption (either the type is encrypted but a passphrase 55 // 2. It requires encryption (either the type is encrypted but a passphrase
56 // is missing from the cryptographer, or the entry itself wasn't properly 56 // is missing from the cryptographer, or the entry itself wasn't properly
57 // encrypted). 57 // encrypted).
58 // 3. It's type is currently throttled. 58 // 3. It's type is currently throttled.
59 // 4. It's a delete but has not been committed. 59 // 4. It's a delete but has not been committed.
60 void FilterUnreadyEntries( 60 void FilterUnreadyEntries(
61 syncable::BaseTransaction* trans, 61 syncable::BaseTransaction* trans,
62 syncable::ModelTypeSet throttled_types, 62 syncer::ModelTypeSet throttled_types,
63 syncable::ModelTypeSet encrypted_types, 63 syncer::ModelTypeSet encrypted_types,
64 bool passphrase_missing, 64 bool passphrase_missing,
65 const syncable::Directory::UnsyncedMetaHandles& unsynced_handles, 65 const syncable::Directory::UnsyncedMetaHandles& unsynced_handles,
66 std::set<int64>* ready_unsynced_set); 66 std::set<int64>* ready_unsynced_set);
67 67
68 private: 68 private:
69 // Add all the uncommitted parents (and their predecessors) of |item| to 69 // Add all the uncommitted parents (and their predecessors) of |item| to
70 // |result| if they are ready to commit. Entries are added in root->child 70 // |result| if they are ready to commit. Entries are added in root->child
71 // order and predecessor->successor order. 71 // order and predecessor->successor order.
72 // Returns values: 72 // Returns values:
73 // False: if a dependent item was in conflict, and hence no child cannot be 73 // False: if a dependent item was in conflict, and hence no child cannot be
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 131
132 // Output parameter; see constructor comment. 132 // Output parameter; see constructor comment.
133 sessions::OrderedCommitSet* commit_set_; 133 sessions::OrderedCommitSet* commit_set_;
134 134
135 DISALLOW_COPY_AND_ASSIGN(GetCommitIdsCommand); 135 DISALLOW_COPY_AND_ASSIGN(GetCommitIdsCommand);
136 }; 136 };
137 137
138 } // namespace syncer 138 } // namespace syncer
139 139
140 #endif // SYNC_ENGINE_GET_COMMIT_IDS_COMMAND_H_ 140 #endif // SYNC_ENGINE_GET_COMMIT_IDS_COMMAND_H_
OLDNEW
« no previous file with comments | « sync/engine/download_updates_command_unittest.cc ('k') | sync/engine/get_commit_ids_command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698