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

Side by Side Diff: chrome/browser/content_settings/content_settings_override_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 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 "components/content_settings/core/browser/content_settings_provider.h" 10 #include "components/content_settings/core/browser/content_settings_provider.h"
(...skipping 15 matching lines...) Expand all
26 public: 26 public:
27 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); 27 static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
28 28
29 OverrideProvider(PrefService* prefs, bool incognito); 29 OverrideProvider(PrefService* prefs, bool incognito);
30 virtual ~OverrideProvider(); 30 virtual ~OverrideProvider();
31 31
32 // ProviderInterface implementations. 32 // ProviderInterface implementations.
33 virtual RuleIterator* GetRuleIterator( 33 virtual RuleIterator* GetRuleIterator(
34 ContentSettingsType content_type, 34 ContentSettingsType content_type,
35 const ResourceIdentifier& resource_identifier, 35 const ResourceIdentifier& resource_identifier,
36 bool incognito) const OVERRIDE; 36 bool incognito) const override;
37 37
38 virtual void ClearAllContentSettingsRules( 38 virtual void ClearAllContentSettingsRules(
39 ContentSettingsType content_type) OVERRIDE; 39 ContentSettingsType content_type) override;
40 40
41 virtual bool SetWebsiteSetting( 41 virtual bool SetWebsiteSetting(
42 const ContentSettingsPattern& primary_pattern, 42 const ContentSettingsPattern& primary_pattern,
43 const ContentSettingsPattern& secondary_pattern, 43 const ContentSettingsPattern& secondary_pattern,
44 ContentSettingsType content_type, 44 ContentSettingsType content_type,
45 const ResourceIdentifier& resource_identifier, 45 const ResourceIdentifier& resource_identifier,
46 base::Value* value) OVERRIDE; 46 base::Value* value) override;
47 47
48 virtual void ShutdownOnUIThread() OVERRIDE; 48 virtual void ShutdownOnUIThread() override;
49 49
50 // Sets if a given |content_type| is |enabled|. 50 // Sets if a given |content_type| is |enabled|.
51 void SetOverrideSetting(ContentSettingsType content_type, bool enabled); 51 void SetOverrideSetting(ContentSettingsType content_type, bool enabled);
52 52
53 // Returns if |content_type| is enabled. If it is not enabled, the content 53 // Returns if |content_type| is enabled. If it is not enabled, the content
54 // setting type is considered globally disabled and acts as though it is 54 // setting type is considered globally disabled and acts as though it is
55 // blocked. If it is enabled, the content setting type's permission is granted 55 // blocked. If it is enabled, the content setting type's permission is granted
56 // by the other providers. 56 // by the other providers.
57 bool IsEnabled(ContentSettingsType content_type) const; 57 bool IsEnabled(ContentSettingsType content_type) const;
58 58
(...skipping 11 matching lines...) Expand all
70 // Used around accesses to the |override_content_settings_| object to 70 // Used around accesses to the |override_content_settings_| object to
71 // guarantee thread safety. 71 // guarantee thread safety.
72 mutable base::Lock lock_; 72 mutable base::Lock lock_;
73 73
74 DISALLOW_COPY_AND_ASSIGN(OverrideProvider); 74 DISALLOW_COPY_AND_ASSIGN(OverrideProvider);
75 }; 75 };
76 76
77 } // namespace content_settings 77 } // namespace content_settings
78 78
79 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_OVERRIDE_PROVIDER_H_ 79 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_OVERRIDE_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698