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

Side by Side Diff: components/content_settings/core/browser/content_settings_pref.h

Issue 2318223002: Remove EmptyRuleIterators with nullptrs. (Closed)
Patch Set: Fix failing unit test 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_H_ 5 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_H_
6 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_H_ 6 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 const std::string&)> NotifyObserversCallback; 44 const std::string&)> NotifyObserversCallback;
45 45
46 ContentSettingsPref(ContentSettingsType content_type, 46 ContentSettingsPref(ContentSettingsType content_type,
47 PrefService* prefs, 47 PrefService* prefs,
48 PrefChangeRegistrar* registrar, 48 PrefChangeRegistrar* registrar,
49 const std::string& pref_name, 49 const std::string& pref_name,
50 bool incognito, 50 bool incognito,
51 NotifyObserversCallback notify_callback); 51 NotifyObserversCallback notify_callback);
52 ~ContentSettingsPref(); 52 ~ContentSettingsPref();
53 53
54 // Returns nullptr to indicate the RuleIterator is empty.
54 std::unique_ptr<RuleIterator> GetRuleIterator( 55 std::unique_ptr<RuleIterator> GetRuleIterator(
55 const ResourceIdentifier& resource_identifier, 56 const ResourceIdentifier& resource_identifier,
56 bool incognito) const; 57 bool incognito) const;
57 58
58 bool SetWebsiteSetting(const ContentSettingsPattern& primary_pattern, 59 bool SetWebsiteSetting(const ContentSettingsPattern& primary_pattern,
59 const ContentSettingsPattern& secondary_pattern, 60 const ContentSettingsPattern& secondary_pattern,
60 const ResourceIdentifier& resource_identifier, 61 const ResourceIdentifier& resource_identifier,
61 base::Value* value); 62 base::Value* value);
62 63
63 void ClearPref(); 64 void ClearPref();
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 mutable base::Lock lock_; 135 mutable base::Lock lock_;
135 136
136 base::ThreadChecker thread_checker_; 137 base::ThreadChecker thread_checker_;
137 138
138 DISALLOW_COPY_AND_ASSIGN(ContentSettingsPref); 139 DISALLOW_COPY_AND_ASSIGN(ContentSettingsPref);
139 }; 140 };
140 141
141 } // namespace content_settings 142 } // namespace content_settings
142 143
143 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_H_ 144 #endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698