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

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

Issue 2054773002: Replace the WAS_INSTALLED_BY_CUSTODIAN creation flag with a pref (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to code review by Marc Created 4 years, 6 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_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_ 6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 #if defined(ENABLE_EXTENSIONS) 291 #if defined(ENABLE_EXTENSIONS)
292 // extensions::ManagementPolicy::Provider implementation: 292 // extensions::ManagementPolicy::Provider implementation:
293 std::string GetDebugPolicyProviderName() const override; 293 std::string GetDebugPolicyProviderName() const override;
294 bool UserMayLoad(const extensions::Extension* extension, 294 bool UserMayLoad(const extensions::Extension* extension,
295 base::string16* error) const override; 295 base::string16* error) const override;
296 bool UserMayModifySettings(const extensions::Extension* extension, 296 bool UserMayModifySettings(const extensions::Extension* extension,
297 base::string16* error) const override; 297 base::string16* error) const override;
298 bool MustRemainInstalled(const extensions::Extension* extension, 298 bool MustRemainInstalled(const extensions::Extension* extension,
299 base::string16* error) const override; 299 base::string16* error) const override;
300 300
301 enum ExtensionState {
302 EXTENSION_FORCED,
303 EXTENSION_BLOCKED,
304 EXTENSION_ALLOWED
305 };
306
307 ExtensionState GetExtensionState(
Devlin 2016/06/20 17:09:25 This warrants a comment
mamir 2016/06/21 11:38:22 Done.
308 const extensions::Extension* extension) const;
309
301 // Extensions helper to SetActive(). 310 // Extensions helper to SetActive().
302 void SetExtensionsActive(); 311 void SetExtensionsActive();
303 #endif 312 #endif
304 313
305 SupervisedUserSettingsService* GetSettingsService(); 314 SupervisedUserSettingsService* GetSettingsService();
306 315
307 size_t FindEnabledPermissionRequestCreator(size_t start); 316 size_t FindEnabledPermissionRequestCreator(size_t start);
308 void AddPermissionRequestInternal( 317 void AddPermissionRequestInternal(
309 const CreatePermissionRequestCallback& create_request, 318 const CreatePermissionRequestCallback& create_request,
310 const SuccessCallback& callback, 319 const SuccessCallback& callback,
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 415
407 // Used to report inappropriate URLs to SafeSarch API. 416 // Used to report inappropriate URLs to SafeSarch API.
408 std::unique_ptr<SafeSearchURLReporter> url_reporter_; 417 std::unique_ptr<SafeSearchURLReporter> url_reporter_;
409 418
410 base::ObserverList<SupervisedUserServiceObserver> observer_list_; 419 base::ObserverList<SupervisedUserServiceObserver> observer_list_;
411 420
412 base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_; 421 base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_;
413 }; 422 };
414 423
415 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_ 424 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698