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

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

Issue 1694923004: Use GURLs instead of patterns in SetContentSetting in notifications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scoping_set_content_setting
Patch Set: remove patterns_ Created 4 years, 9 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_
6 #define CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_ 6 #define CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map>
11 #include <vector> 10 #include <vector>
12 11
13 #include "base/macros.h" 12 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
16 #include "base/observer_list.h" 15 #include "base/observer_list.h"
17 #include "build/build_config.h" 16 #include "build/build_config.h"
18 #include "chrome/browser/profiles/profile_attributes_storage.h" 17 #include "chrome/browser/profiles/profile_attributes_storage.h"
19 #include "chrome/browser/ui/app_icon_loader.h" 18 #include "chrome/browser/ui/app_icon_loader.h"
20 #include "components/content_settings/core/common/content_settings.h" 19 #include "components/content_settings/core/common/content_settings.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 void RebuildNotifierGroups(bool notify); 117 void RebuildNotifierGroups(bool notify);
119 118
120 // The views displaying notifier settings. 119 // The views displaying notifier settings.
121 base::ObserverList<message_center::NotifierSettingsObserver> observers_; 120 base::ObserverList<message_center::NotifierSettingsObserver> observers_;
122 121
123 // The task tracker for loading favicons. 122 // The task tracker for loading favicons.
124 scoped_ptr<base::CancelableTaskTracker> favicon_tracker_; 123 scoped_ptr<base::CancelableTaskTracker> favicon_tracker_;
125 124
126 scoped_ptr<AppIconLoader> app_icon_loader_; 125 scoped_ptr<AppIconLoader> app_icon_loader_;
127 126
128 std::map<base::string16, ContentSettingsPattern> patterns_;
129
130 // The list of all configurable notifier groups. This is each profile that is 127 // The list of all configurable notifier groups. This is each profile that is
131 // loaded (and in the ProfileAttributesStorage - so no incognito profiles go 128 // loaded (and in the ProfileAttributesStorage - so no incognito profiles go
132 // here). 129 // here).
133 std::vector<scoped_ptr<message_center::ProfileNotifierGroup>> 130 std::vector<scoped_ptr<message_center::ProfileNotifierGroup>>
134 notifier_groups_; 131 notifier_groups_;
135 132
136 size_t current_notifier_group_; 133 size_t current_notifier_group_;
137 134
138 content::NotificationRegistrar registrar_; 135 content::NotificationRegistrar registrar_;
139 136
140 ProfileAttributesStorage& profile_attributes_storage_; 137 ProfileAttributesStorage& profile_attributes_storage_;
141 138
142 base::WeakPtrFactory<MessageCenterSettingsController> weak_factory_; 139 base::WeakPtrFactory<MessageCenterSettingsController> weak_factory_;
143 140
144 DISALLOW_COPY_AND_ASSIGN(MessageCenterSettingsController); 141 DISALLOW_COPY_AND_ASSIGN(MessageCenterSettingsController);
145 }; 142 };
146 143
147 #endif // CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_ 144 #endif // CHROME_BROWSER_NOTIFICATIONS_MESSAGE_CENTER_SETTINGS_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698