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

Side by Side Diff: chrome/browser/content_settings/content_settings_policy_provider.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_POLICY_PROVIDER_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_POLICY_PROVIDER_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_POLICY_PROVIDER_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_POLICY_PROVIDER_H_
7 7
8 // A content settings provider that takes its settings out of policies. 8 // A content settings provider that takes its settings out of policies.
9 9
10 #include <vector> 10 #include <vector>
(...skipping 16 matching lines...) Expand all
27 class PolicyProvider : public ObservableProvider { 27 class PolicyProvider : public ObservableProvider {
28 public: 28 public:
29 explicit PolicyProvider(PrefService* prefs); 29 explicit PolicyProvider(PrefService* prefs);
30 virtual ~PolicyProvider(); 30 virtual ~PolicyProvider();
31 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); 31 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
32 32
33 // ProviderInterface implementations. 33 // ProviderInterface implementations.
34 virtual RuleIterator* GetRuleIterator( 34 virtual RuleIterator* GetRuleIterator(
35 ContentSettingsType content_type, 35 ContentSettingsType content_type,
36 const ResourceIdentifier& resource_identifier, 36 const ResourceIdentifier& resource_identifier,
37 bool incognito) const OVERRIDE; 37 bool incognito) const override;
38 38
39 virtual bool SetWebsiteSetting( 39 virtual bool SetWebsiteSetting(
40 const ContentSettingsPattern& primary_pattern, 40 const ContentSettingsPattern& primary_pattern,
41 const ContentSettingsPattern& secondary_pattern, 41 const ContentSettingsPattern& secondary_pattern,
42 ContentSettingsType content_type, 42 ContentSettingsType content_type,
43 const ResourceIdentifier& resource_identifier, 43 const ResourceIdentifier& resource_identifier,
44 base::Value* value) OVERRIDE; 44 base::Value* value) override;
45 45
46 virtual void ClearAllContentSettingsRules( 46 virtual void ClearAllContentSettingsRules(
47 ContentSettingsType content_type) OVERRIDE; 47 ContentSettingsType content_type) override;
48 48
49 virtual void ShutdownOnUIThread() OVERRIDE; 49 virtual void ShutdownOnUIThread() override;
50 50
51 private: 51 private:
52 // Reads the policy managed default settings. 52 // Reads the policy managed default settings.
53 void ReadManagedDefaultSettings(); 53 void ReadManagedDefaultSettings();
54 54
55 // Callback for preference changes. 55 // Callback for preference changes.
56 void OnPreferenceChanged(const std::string& pref_name); 56 void OnPreferenceChanged(const std::string& pref_name);
57 57
58 // Reads the policy controlled default settings for a specific content type. 58 // Reads the policy controlled default settings for a specific content type.
59 void UpdateManagedDefaultSetting(ContentSettingsType content_type); 59 void UpdateManagedDefaultSetting(ContentSettingsType content_type);
(...skipping 16 matching lines...) Expand all
76 // Used around accesses to the |value_map_| object to guarantee 76 // Used around accesses to the |value_map_| object to guarantee
77 // thread safety. 77 // thread safety.
78 mutable base::Lock lock_; 78 mutable base::Lock lock_;
79 79
80 DISALLOW_COPY_AND_ASSIGN(PolicyProvider); 80 DISALLOW_COPY_AND_ASSIGN(PolicyProvider);
81 }; 81 };
82 82
83 } // namespace content_settings 83 } // namespace content_settings
84 84
85 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_POLICY_PROVIDER_H_ 85 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_POLICY_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698