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

Side by Side Diff: components/sync/core_impl/sync_encryption_handler_impl.cc

Issue 2293583002: Change includes of histogram.h to histogram_macros.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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
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 "components/sync/core_impl/sync_encryption_handler_impl.h" 5 #include "components/sync/core_impl/sync_encryption_handler_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <queue> 11 #include <queue>
12 #include <string> 12 #include <string>
13 13
14 #include "base/base64.h" 14 #include "base/base64.h"
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/json/json_string_value_serializer.h" 16 #include "base/json/json_string_value_serializer.h"
17 #include "base/location.h" 17 #include "base/location.h"
18 #include "base/metrics/histogram.h" 18 #include "base/metrics/histogram_macros.h"
19 #include "base/single_thread_task_runner.h" 19 #include "base/single_thread_task_runner.h"
20 #include "base/threading/thread_task_runner_handle.h" 20 #include "base/threading/thread_task_runner_handle.h"
21 #include "base/time/time.h" 21 #include "base/time/time.h"
22 #include "base/tracked_objects.h" 22 #include "base/tracked_objects.h"
23 #include "components/sync/base/cryptographer.h" 23 #include "components/sync/base/cryptographer.h"
24 #include "components/sync/base/encryptor.h" 24 #include "components/sync/base/encryptor.h"
25 #include "components/sync/base/experiments.h" 25 #include "components/sync/base/experiments.h"
26 #include "components/sync/base/time.h" 26 #include "components/sync/base/time.h"
27 #include "components/sync/core/read_node.h" 27 #include "components/sync/core/read_node.h"
28 #include "components/sync/core/read_transaction.h" 28 #include "components/sync/core/read_transaction.h"
(...skipping 1610 matching lines...) Expand 10 before | Expand all | Expand 10 after
1639 1639
1640 base::Time SyncEncryptionHandlerImpl::GetExplicitPassphraseTime() const { 1640 base::Time SyncEncryptionHandlerImpl::GetExplicitPassphraseTime() const {
1641 if (passphrase_type_ == FROZEN_IMPLICIT_PASSPHRASE) 1641 if (passphrase_type_ == FROZEN_IMPLICIT_PASSPHRASE)
1642 return migration_time(); 1642 return migration_time();
1643 else if (passphrase_type_ == CUSTOM_PASSPHRASE) 1643 else if (passphrase_type_ == CUSTOM_PASSPHRASE)
1644 return custom_passphrase_time(); 1644 return custom_passphrase_time();
1645 return base::Time(); 1645 return base::Time();
1646 } 1646 }
1647 1647
1648 } // namespace syncer 1648 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/core_impl/attachments/on_disk_attachment_store.cc ('k') | components/sync/core_impl/sync_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698