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

Side by Side Diff: components/content_settings/core/browser/host_content_settings_map.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 (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 #include "components/content_settings/core/browser/host_content_settings_map.h" 5 #include "components/content_settings/core/browser/host_content_settings_map.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram_macros.h"
15 #include "base/stl_util.h" 15 #include "base/stl_util.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/time/clock.h" 18 #include "base/time/clock.h"
19 #include "build/build_config.h" 19 #include "build/build_config.h"
20 #include "components/content_settings/core/browser/content_settings_default_prov ider.h" 20 #include "components/content_settings/core/browser/content_settings_default_prov ider.h"
21 #include "components/content_settings/core/browser/content_settings_details.h" 21 #include "components/content_settings/core/browser/content_settings_details.h"
22 #include "components/content_settings/core/browser/content_settings_info.h" 22 #include "components/content_settings/core/browser/content_settings_info.h"
23 #include "components/content_settings/core/browser/content_settings_observable_p rovider.h" 23 #include "components/content_settings/core/browser/content_settings_observable_p rovider.h"
24 #include "components/content_settings/core/browser/content_settings_policy_provi der.h" 24 #include "components/content_settings/core/browser/content_settings_policy_provi der.h"
(...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after
960 rule.secondary_pattern.Matches(secondary_url)) { 960 rule.secondary_pattern.Matches(secondary_url)) {
961 if (primary_pattern) 961 if (primary_pattern)
962 *primary_pattern = rule.primary_pattern; 962 *primary_pattern = rule.primary_pattern;
963 if (secondary_pattern) 963 if (secondary_pattern)
964 *secondary_pattern = rule.secondary_pattern; 964 *secondary_pattern = rule.secondary_pattern;
965 return base::WrapUnique(rule.value.get()->DeepCopy()); 965 return base::WrapUnique(rule.value.get()->DeepCopy());
966 } 966 }
967 } 967 }
968 return std::unique_ptr<base::Value>(); 968 return std::unique_ptr<base::Value>();
969 } 969 }
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_pingback_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698