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

Side by Side Diff: sync/util/cryptographer.h

Issue 10690071: [Sync] Move model_type* from syncable/ to base/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/util/DEPS ('k') | sync/util/cryptographer_unittest.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_UTIL_CRYPTOGRAPHER_H_ 5 #ifndef SYNC_UTIL_CRYPTOGRAPHER_H_
6 #define SYNC_UTIL_CRYPTOGRAPHER_H_ 6 #define SYNC_UTIL_CRYPTOGRAPHER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 11
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/memory/linked_ptr.h" 13 #include "base/memory/linked_ptr.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "sync/internal_api/public/syncable/model_type.h" 16 #include "sync/internal_api/public/base/model_type.h"
17 #include "sync/protocol/encryption.pb.h" 17 #include "sync/protocol/encryption.pb.h"
18 #include "sync/protocol/nigori_specifics.pb.h" 18 #include "sync/protocol/nigori_specifics.pb.h"
19 #include "sync/util/nigori.h" 19 #include "sync/util/nigori.h"
20 20
21 namespace syncer { 21 namespace syncer {
22 22
23 class Encryptor; 23 class Encryptor;
24 24
25 extern const char kNigoriTag[]; 25 extern const char kNigoriTag[];
26 26
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 244
245 syncable::ModelTypeSet encrypted_types_; 245 syncable::ModelTypeSet encrypted_types_;
246 bool encrypt_everything_; 246 bool encrypt_everything_;
247 247
248 DISALLOW_COPY_AND_ASSIGN(Cryptographer); 248 DISALLOW_COPY_AND_ASSIGN(Cryptographer);
249 }; 249 };
250 250
251 } // namespace syncer 251 } // namespace syncer
252 252
253 #endif // SYNC_UTIL_CRYPTOGRAPHER_H_ 253 #endif // SYNC_UTIL_CRYPTOGRAPHER_H_
OLDNEW
« no previous file with comments | « sync/util/DEPS ('k') | sync/util/cryptographer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698