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

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

Issue 593153002: Restore the iframe behavior of notification permissions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 (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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 void FirePermissionLevelChangedEvent( 127 void FirePermissionLevelChangedEvent(
128 const message_center::NotifierId& notifier_id, 128 const message_center::NotifierId& notifier_id,
129 bool enabled); 129 bool enabled);
130 130
131 // extensions::ExtensionRegistryObserver: 131 // extensions::ExtensionRegistryObserver:
132 virtual void OnExtensionUninstalled( 132 virtual void OnExtensionUninstalled(
133 content::BrowserContext* browser_context, 133 content::BrowserContext* browser_context,
134 const extensions::Extension* extension, 134 const extensions::Extension* extension,
135 extensions::UninstallReason reason) OVERRIDE; 135 extensions::UninstallReason reason) OVERRIDE;
136 136
137 // PermissionContextBase:
138 virtual void UpdateContentSetting(const GURL& requesting_origin,
139 const GURL& embedder_origin,
140 bool allowed) OVERRIDE;
141
137 // The profile which owns this object. 142 // The profile which owns this object.
138 Profile* profile_; 143 Profile* profile_;
139 144
140 // Prefs listener for disabled_extension_id. 145 // Prefs listener for disabled_extension_id.
141 StringListPrefMember disabled_extension_id_pref_; 146 StringListPrefMember disabled_extension_id_pref_;
142 147
143 // Prefs listener for disabled_system_component_id. 148 // Prefs listener for disabled_system_component_id.
144 StringListPrefMember disabled_system_component_id_pref_; 149 StringListPrefMember disabled_system_component_id_pref_;
145 150
146 // On-memory data for the availability of extensions. 151 // On-memory data for the availability of extensions.
147 std::set<std::string> disabled_extension_ids_; 152 std::set<std::string> disabled_extension_ids_;
148 153
149 // On-memory data for the availability of system_component. 154 // On-memory data for the availability of system_component.
150 std::set<std::string> disabled_system_component_ids_; 155 std::set<std::string> disabled_system_component_ids_;
151 156
152 // An observer to listen when extension is uninstalled. 157 // An observer to listen when extension is uninstalled.
153 ScopedObserver<extensions::ExtensionRegistry, 158 ScopedObserver<extensions::ExtensionRegistry,
154 extensions::ExtensionRegistryObserver> 159 extensions::ExtensionRegistryObserver>
155 extension_registry_observer_; 160 extension_registry_observer_;
156 161
157 // Welcome Notification 162 // Welcome Notification
158 scoped_ptr<ExtensionWelcomeNotification> chrome_now_welcome_notification_; 163 scoped_ptr<ExtensionWelcomeNotification> chrome_now_welcome_notification_;
159 164
160 base::WeakPtrFactory<DesktopNotificationService> weak_factory_; 165 base::WeakPtrFactory<DesktopNotificationService> weak_factory_;
161 166
162 DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService); 167 DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService);
163 }; 168 };
164 169
165 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_ 170 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698