OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_OVERRIDE_PROVIDER_H_ | 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_OVERRIDE_PROVIDER_H_ |
6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_OVERRIDE_PROVIDER_H_ | 6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_OVERRIDE_PROVIDER_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/synchronization/lock.h" | 9 #include "base/synchronization/lock.h" |
| 10 #include "base/threading/thread_checker.h" |
10 #include "components/content_settings/core/browser/content_settings_provider.h" | 11 #include "components/content_settings/core/browser/content_settings_provider.h" |
11 #include "components/content_settings/core/common/content_settings_types.h" | 12 #include "components/content_settings/core/common/content_settings_types.h" |
12 | 13 |
13 class ContentSettingsPattern; | 14 class ContentSettingsPattern; |
14 class PrefService; | 15 class PrefService; |
15 | 16 |
16 namespace user_prefs { | 17 namespace user_prefs { |
17 class PrefRegistrySyncable; | 18 class PrefRegistrySyncable; |
18 } | 19 } |
19 | 20 |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 bool allowed_settings_[CONTENT_SETTINGS_NUM_TYPES]; | 65 bool allowed_settings_[CONTENT_SETTINGS_NUM_TYPES]; |
65 | 66 |
66 PrefService* prefs_; | 67 PrefService* prefs_; |
67 | 68 |
68 bool is_incognito_; | 69 bool is_incognito_; |
69 | 70 |
70 // Used around accesses to the |override_content_settings_| object to | 71 // Used around accesses to the |override_content_settings_| object to |
71 // guarantee thread safety. | 72 // guarantee thread safety. |
72 mutable base::Lock lock_; | 73 mutable base::Lock lock_; |
73 | 74 |
| 75 base::ThreadChecker thread_checker_; |
| 76 |
74 DISALLOW_COPY_AND_ASSIGN(OverrideProvider); | 77 DISALLOW_COPY_AND_ASSIGN(OverrideProvider); |
75 }; | 78 }; |
76 | 79 |
77 } // namespace content_settings | 80 } // namespace content_settings |
78 | 81 |
79 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_OVERRIDE_PROVIDER_H_ | 82 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_OVERRIDE_PROVIDER_H_ |
OLD | NEW |