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

Side by Side Diff: chrome/browser/content_settings/content_settings_internal_extension_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) 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 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_PROV IDER_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_PROV IDER_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_PROV IDER_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_PROV IDER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
10 #include "components/content_settings/core/browser/content_settings_observable_p rovider.h" 10 #include "components/content_settings/core/browser/content_settings_observable_p rovider.h"
(...skipping 15 matching lines...) Expand all
26 public content::NotificationObserver { 26 public content::NotificationObserver {
27 public: 27 public:
28 explicit InternalExtensionProvider(ExtensionService* extension_service); 28 explicit InternalExtensionProvider(ExtensionService* extension_service);
29 29
30 virtual ~InternalExtensionProvider(); 30 virtual ~InternalExtensionProvider();
31 31
32 // ProviderInterface methods: 32 // ProviderInterface methods:
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 bool SetWebsiteSetting( 38 virtual bool SetWebsiteSetting(
39 const ContentSettingsPattern& primary_pattern, 39 const ContentSettingsPattern& primary_pattern,
40 const ContentSettingsPattern& secondary_pattern, 40 const ContentSettingsPattern& secondary_pattern,
41 ContentSettingsType content_type, 41 ContentSettingsType content_type,
42 const ResourceIdentifier& resource_identifier, 42 const ResourceIdentifier& resource_identifier,
43 base::Value* value) OVERRIDE; 43 base::Value* value) override;
44 44
45 virtual void ClearAllContentSettingsRules(ContentSettingsType content_type) 45 virtual void ClearAllContentSettingsRules(ContentSettingsType content_type)
46 OVERRIDE; 46 override;
47 47
48 virtual void ShutdownOnUIThread() OVERRIDE; 48 virtual void ShutdownOnUIThread() override;
49 49
50 // content::NotificationObserver implementation. 50 // content::NotificationObserver implementation.
51 virtual void Observe(int type, 51 virtual void Observe(int type,
52 const content::NotificationSource& source, 52 const content::NotificationSource& source,
53 const content::NotificationDetails& details) OVERRIDE; 53 const content::NotificationDetails& details) override;
54 private: 54 private:
55 void SetContentSettingForExtension(const extensions::Extension* extension, 55 void SetContentSettingForExtension(const extensions::Extension* extension,
56 ContentSetting setting); 56 ContentSetting setting);
57 void SetContentSettingForExtensionAndResource( 57 void SetContentSettingForExtensionAndResource(
58 const extensions::Extension* extension, 58 const extensions::Extension* extension,
59 const ResourceIdentifier& resource, 59 const ResourceIdentifier& resource,
60 ContentSetting setting); 60 ContentSetting setting);
61 61
62 OriginIdentifierValueMap value_map_; 62 OriginIdentifierValueMap value_map_;
63 63
64 // Used around accesses to the |value_map_| list to guarantee thread safety. 64 // Used around accesses to the |value_map_| list to guarantee thread safety.
65 mutable base::Lock lock_; 65 mutable base::Lock lock_;
66 scoped_ptr<content::NotificationRegistrar> registrar_; 66 scoped_ptr<content::NotificationRegistrar> registrar_;
67 67
68 DISALLOW_COPY_AND_ASSIGN(InternalExtensionProvider); 68 DISALLOW_COPY_AND_ASSIGN(InternalExtensionProvider);
69 }; 69 };
70 70
71 } // namespace content_settings 71 } // namespace content_settings
72 72
73 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_P ROVIDER_H_ 73 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_INTERNAL_EXTENSION_P ROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698