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

Side by Side Diff: components/sync/syncable/directory.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/syncable/directory.h" 5 #include "components/sync/syncable/directory.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
11 #include <iterator> 11 #include <iterator>
12 #include <utility> 12 #include <utility>
13 13
14 #include "base/base64.h" 14 #include "base/base64.h"
15 #include "base/guid.h" 15 #include "base/guid.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram_macros.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/strings/string_number_conversions.h" 18 #include "base/strings/string_number_conversions.h"
19 #include "base/trace_event/trace_event.h" 19 #include "base/trace_event/trace_event.h"
20 #include "components/sync/base/attachment_id_proto.h" 20 #include "components/sync/base/attachment_id_proto.h"
21 #include "components/sync/base/unique_position.h" 21 #include "components/sync/base/unique_position.h"
22 #include "components/sync/base/unrecoverable_error_handler.h" 22 #include "components/sync/base/unrecoverable_error_handler.h"
23 #include "components/sync/syncable/entry.h" 23 #include "components/sync/syncable/entry.h"
24 #include "components/sync/syncable/entry_kernel.h" 24 #include "components/sync/syncable/entry_kernel.h"
25 #include "components/sync/syncable/in_memory_directory_backing_store.h" 25 #include "components/sync/syncable/in_memory_directory_backing_store.h"
26 #include "components/sync/syncable/model_neutral_mutable_entry.h" 26 #include "components/sync/syncable/model_neutral_mutable_entry.h"
(...skipping 1516 matching lines...) Expand 10 before | Expand all | Expand 10 after
1543 Directory::Kernel* Directory::kernel() { 1543 Directory::Kernel* Directory::kernel() {
1544 return kernel_; 1544 return kernel_;
1545 } 1545 }
1546 1546
1547 const Directory::Kernel* Directory::kernel() const { 1547 const Directory::Kernel* Directory::kernel() const {
1548 return kernel_; 1548 return kernel_;
1549 } 1549 }
1550 1550
1551 } // namespace syncable 1551 } // namespace syncable
1552 } // namespace syncer 1552 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/engine_impl/conflict_resolver.cc ('k') | components/sync/syncable/on_disk_directory_backing_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698