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

Side by Side Diff: chrome/browser/notifications/desktop_notification_service.h

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_ 5 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
6 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_ 6 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 void FirePermissionLevelChangedEvent( 130 void FirePermissionLevelChangedEvent(
131 const message_center::NotifierId& notifier_id, 131 const message_center::NotifierId& notifier_id,
132 bool enabled); 132 bool enabled);
133 133
134 #if defined(ENABLE_EXTENSIONS) 134 #if defined(ENABLE_EXTENSIONS)
135 // extensions::ExtensionRegistryObserver: 135 // extensions::ExtensionRegistryObserver:
136 virtual void OnExtensionUninstalled( 136 virtual void OnExtensionUninstalled(
137 content::BrowserContext* browser_context, 137 content::BrowserContext* browser_context,
138 const extensions::Extension* extension, 138 const extensions::Extension* extension,
139 extensions::UninstallReason reason) OVERRIDE; 139 extensions::UninstallReason reason) override;
140 #endif 140 #endif
141 141
142 // PermissionContextBase: 142 // PermissionContextBase:
143 virtual void UpdateContentSetting(const GURL& requesting_origin, 143 virtual void UpdateContentSetting(const GURL& requesting_origin,
144 const GURL& embedder_origin, 144 const GURL& embedder_origin,
145 bool allowed) OVERRIDE; 145 bool allowed) override;
146 146
147 // The profile which owns this object. 147 // The profile which owns this object.
148 Profile* profile_; 148 Profile* profile_;
149 149
150 // Prefs listener for disabled_extension_id. 150 // Prefs listener for disabled_extension_id.
151 StringListPrefMember disabled_extension_id_pref_; 151 StringListPrefMember disabled_extension_id_pref_;
152 152
153 // Prefs listener for disabled_system_component_id. 153 // Prefs listener for disabled_system_component_id.
154 StringListPrefMember disabled_system_component_id_pref_; 154 StringListPrefMember disabled_system_component_id_pref_;
155 155
156 // On-memory data for the availability of extensions. 156 // On-memory data for the availability of extensions.
157 std::set<std::string> disabled_extension_ids_; 157 std::set<std::string> disabled_extension_ids_;
158 158
159 // On-memory data for the availability of system_component. 159 // On-memory data for the availability of system_component.
160 std::set<std::string> disabled_system_component_ids_; 160 std::set<std::string> disabled_system_component_ids_;
161 161
162 #if defined(ENABLE_EXTENSIONS) 162 #if defined(ENABLE_EXTENSIONS)
163 // An observer to listen when extension is uninstalled. 163 // An observer to listen when extension is uninstalled.
164 ScopedObserver<extensions::ExtensionRegistry, 164 ScopedObserver<extensions::ExtensionRegistry,
165 extensions::ExtensionRegistryObserver> 165 extensions::ExtensionRegistryObserver>
166 extension_registry_observer_; 166 extension_registry_observer_;
167 #endif 167 #endif
168 168
169 base::WeakPtrFactory<DesktopNotificationService> weak_factory_; 169 base::WeakPtrFactory<DesktopNotificationService> weak_factory_;
170 170
171 DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService); 171 DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService);
172 }; 172 };
173 173
174 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_ 174 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698