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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_settings_service.h

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 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 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_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_
6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_ 6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 void Init(scoped_refptr<PersistentPrefStore> pref_store); 78 void Init(scoped_refptr<PersistentPrefStore> pref_store);
79 79
80 // Adds a callback to be called when supervised user settings are initially 80 // Adds a callback to be called when supervised user settings are initially
81 // available, or when they change. 81 // available, or when they change.
82 scoped_ptr<SettingsCallbackList::Subscription> Subscribe( 82 scoped_ptr<SettingsCallbackList::Subscription> Subscribe(
83 const SettingsCallback& callback) WARN_UNUSED_RESULT; 83 const SettingsCallback& callback) WARN_UNUSED_RESULT;
84 84
85 // Gets the associated profile 85 // Gets the associated profile
86 // This is currently only used for subscribing to notifications, it will be 86 // This is currently only used for subscribing to notifications, it will be
87 // nullptr in tests and will soon be removed. 87 // nullptr in tests and will soon be removed.
88 // TODO(peconn): Remove this once HostContentSettingsMap is a KeyedService 88 // TODO(peconn): Remove this once SupervisedUserPrefStore is (partially at
89 // least) a KeyedService, see TODO in SupervisedUserPrefStore.
89 Profile* GetProfile(); 90 Profile* GetProfile();
90 91
91 // Activates/deactivates the service. This is called by the 92 // Activates/deactivates the service. This is called by the
92 // SupervisedUserService when it is (de)activated. 93 // SupervisedUserService when it is (de)activated.
93 void SetActive(bool active); 94 void SetActive(bool active);
94 95
95 // Whether supervised user settings are available. 96 // Whether supervised user settings are available.
96 bool IsReady(); 97 bool IsReady();
97 98
98 // Clears all supervised user settings and items. 99 // Clears all supervised user settings and items.
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 172
172 SettingsCallbackList callback_list_; 173 SettingsCallbackList callback_list_;
173 174
174 scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; 175 scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
175 scoped_ptr<syncer::SyncErrorFactory> error_handler_; 176 scoped_ptr<syncer::SyncErrorFactory> error_handler_;
176 177
177 DISALLOW_COPY_AND_ASSIGN(SupervisedUserSettingsService); 178 DISALLOW_COPY_AND_ASSIGN(SupervisedUserSettingsService);
178 }; 179 };
179 180
180 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_ 181 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698