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

Side by Side Diff: sync/internal_api/sync_encryption_handler_impl.cc

Issue 18031009: Use a direct include of time headers in rlz/, skia/, sql/, sync/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/internal_api/sync_encryption_handler_impl.h" 5 #include "sync/internal_api/sync_encryption_handler_impl.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <string> 8 #include <string>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/json/json_string_value_serializer.h" 12 #include "base/json/json_string_value_serializer.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/time.h" 14 #include "base/metrics/histogram.h"
15 #include "base/time/time.h"
15 #include "base/tracked_objects.h" 16 #include "base/tracked_objects.h"
16 #include "base/metrics/histogram.h"
17 #include "sync/internal_api/public/read_node.h" 17 #include "sync/internal_api/public/read_node.h"
18 #include "sync/internal_api/public/read_transaction.h" 18 #include "sync/internal_api/public/read_transaction.h"
19 #include "sync/internal_api/public/user_share.h" 19 #include "sync/internal_api/public/user_share.h"
20 #include "sync/internal_api/public/util/experiments.h" 20 #include "sync/internal_api/public/util/experiments.h"
21 #include "sync/internal_api/public/util/sync_string_conversions.h"
21 #include "sync/internal_api/public/write_node.h" 22 #include "sync/internal_api/public/write_node.h"
22 #include "sync/internal_api/public/write_transaction.h" 23 #include "sync/internal_api/public/write_transaction.h"
23 #include "sync/internal_api/public/util/sync_string_conversions.h"
24 #include "sync/protocol/encryption.pb.h" 24 #include "sync/protocol/encryption.pb.h"
25 #include "sync/protocol/nigori_specifics.pb.h" 25 #include "sync/protocol/nigori_specifics.pb.h"
26 #include "sync/protocol/sync.pb.h" 26 #include "sync/protocol/sync.pb.h"
27 #include "sync/syncable/directory.h" 27 #include "sync/syncable/directory.h"
28 #include "sync/syncable/entry.h" 28 #include "sync/syncable/entry.h"
29 #include "sync/syncable/nigori_util.h" 29 #include "sync/syncable/nigori_util.h"
30 #include "sync/syncable/syncable_base_transaction.h" 30 #include "sync/syncable/syncable_base_transaction.h"
31 #include "sync/util/cryptographer.h" 31 #include "sync/util/cryptographer.h"
32 #include "sync/util/encryptor.h" 32 #include "sync/util/encryptor.h"
33 #include "sync/util/time.h" 33 #include "sync/util/time.h"
(...skipping 1609 matching lines...) Expand 10 before | Expand all | Expand 10 after
1643 1643
1644 base::Time SyncEncryptionHandlerImpl::GetExplicitPassphraseTime() const { 1644 base::Time SyncEncryptionHandlerImpl::GetExplicitPassphraseTime() const {
1645 if (passphrase_type_ == FROZEN_IMPLICIT_PASSPHRASE) 1645 if (passphrase_type_ == FROZEN_IMPLICIT_PASSPHRASE)
1646 return migration_time(); 1646 return migration_time();
1647 else if (passphrase_type_ == CUSTOM_PASSPHRASE) 1647 else if (passphrase_type_ == CUSTOM_PASSPHRASE)
1648 return custom_passphrase_time(); 1648 return custom_passphrase_time();
1649 return base::Time(); 1649 return base::Time();
1650 } 1650 }
1651 1651
1652 } // namespace browser_sync 1652 } // namespace browser_sync
OLDNEW
« no previous file with comments | « sync/internal_api/sync_encryption_handler_impl.h ('k') | sync/internal_api/syncapi_server_connection_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698