OLD | NEW |
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 "chrome/browser/content_settings/content_settings_pref_provider.h" | 5 #include "chrome/browser/content_settings/content_settings_pref_provider.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "base/auto_reset.h" | 11 #include "base/auto_reset.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/metrics/histogram.h" | 14 #include "base/metrics/histogram.h" |
15 #include "base/prefs/pref_service.h" | 15 #include "base/prefs/pref_service.h" |
16 #include "chrome/browser/content_settings/content_settings_rule.h" | 16 #include "chrome/browser/content_settings/content_settings_rule.h" |
17 #include "chrome/browser/content_settings/content_settings_utils.h" | 17 #include "chrome/browser/content_settings/content_settings_utils.h" |
18 #include "chrome/browser/content_settings/host_content_settings_map.h" | 18 #include "chrome/browser/content_settings/host_content_settings_map.h" |
19 #include "chrome/browser/prefs/pref_registry_syncable.h" | |
20 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 19 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
21 #include "chrome/common/chrome_notification_types.h" | 20 #include "chrome/common/chrome_notification_types.h" |
22 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
23 #include "chrome/common/content_settings.h" | 22 #include "chrome/common/content_settings.h" |
24 #include "chrome/common/content_settings_pattern.h" | 23 #include "chrome/common/content_settings_pattern.h" |
25 #include "chrome/common/pref_names.h" | 24 #include "chrome/common/pref_names.h" |
| 25 #include "components/user_prefs/pref_registry_syncable.h" |
26 #include "content/public/browser/browser_thread.h" | 26 #include "content/public/browser/browser_thread.h" |
27 #include "content/public/browser/notification_details.h" | 27 #include "content/public/browser/notification_details.h" |
28 #include "content/public/browser/notification_source.h" | 28 #include "content/public/browser/notification_source.h" |
29 #include "content/public/browser/user_metrics.h" | 29 #include "content/public/browser/user_metrics.h" |
30 #include "googleurl/src/gurl.h" | 30 #include "googleurl/src/gurl.h" |
31 | 31 |
32 using content::BrowserThread; | 32 using content::BrowserThread; |
33 using content::UserMetricsAction; | 33 using content::UserMetricsAction; |
34 | 34 |
35 namespace { | 35 namespace { |
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
564 | 564 |
565 void PrefProvider::AssertLockNotHeld() const { | 565 void PrefProvider::AssertLockNotHeld() const { |
566 #if !defined(NDEBUG) | 566 #if !defined(NDEBUG) |
567 // |Lock::Acquire()| will assert if the lock is held by this thread. | 567 // |Lock::Acquire()| will assert if the lock is held by this thread. |
568 lock_.Acquire(); | 568 lock_.Acquire(); |
569 lock_.Release(); | 569 lock_.Release(); |
570 #endif | 570 #endif |
571 } | 571 } |
572 | 572 |
573 } // namespace content_settings | 573 } // namespace content_settings |
OLD | NEW |