Supervised users: When an extension requires new permissions, send request to custodian

chrome/browser/supervised_user/supervised_user_service.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 93 matching lines @@
   // (in SupervisedUserResourceThrottle).
   scoped_refptr<const SupervisedUserURLFilter> GetURLFilterForIOThread();
 
   // Returns the URL filter for the UI thread, for filtering navigations and
   // classifying sites in the history view.
   SupervisedUserURLFilter* GetURLFilterForUIThread();
 
   // Returns the whitelist service.
   SupervisedUserWhitelistService* GetWhitelistService();
 
-  // Whether the user can request access to blocked URLs.
+  // Whether the user can request to get access to blocked URLs or to new
+  // extensions.
   bool AccessRequestsEnabled();
 
-  // Adds an access request for the given URL. The requests are stored using
-  // a prefix followed by a URIEncoded version of the URL. Each entry contains
-  // a dictionary which currently has the timestamp of the request in it.
-  void AddAccessRequest(const GURL& url, const SuccessCallback& callback);
+  // Adds an access request for the given URL.
+  void AddURLAccessRequest(const GURL& url, const SuccessCallback& callback);
+
+  // Adds an update request for the given WebStore item (App/Extension).
+  void AddExtensionUpdateRequest(const std::string& extension_id,
+                                 const SuccessCallback& callback);
 
   // Returns the email address of the custodian.
   std::string GetCustodianEmailAddress() const;
 
   // Returns the name of the custodian, or the email address if the name is
   // empty.
   std::string GetCustodianName() const;
 
   // Returns the email address of the second custodian, or the empty string
   // if there is no second custodian.
@@ skipping 48 matching lines @@
   friend class SupervisedUserServiceFactory;
   FRIEND_TEST_ALL_PREFIXES(SingleClientSupervisedUserSettingsSyncTest, Sanity);
   FRIEND_TEST_ALL_PREFIXES(SupervisedUserServiceTest, ClearOmitOnRegistration);
   FRIEND_TEST_ALL_PREFIXES(SupervisedUserServiceTest,
                            ChangesIncludedSessionOnChangedSettings);
   FRIEND_TEST_ALL_PREFIXES(SupervisedUserServiceTest,
                            ChangesSyncSessionStateOnChangedSettings);
   FRIEND_TEST_ALL_PREFIXES(SupervisedUserServiceExtensionTest,
                            ExtensionManagementPolicyProvider);
 
+  typedef base::Callback<void(PermissionRequestCreator*,

[Bernhard Bauer, 2015/03/03 11:14:01]

Optional: you could use `using` instead of typedef.

[Marc Treib, 2015/03/03 11:32:20]

Done. I've also updated the existing typedefs to using.

+                              const SuccessCallback&)>
+      CreatePermissionRequestCallback;
+
   // A bridge from the UI thread to the SupervisedUserURLFilters, one of which
   // lives on the IO thread. This class mediates access to them and makes sure
   // they are kept in sync.
   class URLFilterContext {
    public:
     URLFilterContext();
     ~URLFilterContext();
 
     SupervisedUserURLFilter* ui_url_filter() const;
     SupervisedUserURLFilter* io_url_filter() const;
@@ skipping 60 matching lines @@
   bool MustRemainInstalled(const extensions::Extension* extension,
                            base::string16* error) const override;
 
   // Extensions helper to SetActive().
   void SetExtensionsActive();
 #endif
 
   SupervisedUserSettingsService* GetSettingsService();
 
   size_t FindEnabledPermissionRequestCreator(size_t start);
-  void AddAccessRequestInternal(const GURL& url,
-                                const SuccessCallback& callback,
-                                size_t index);
-  void OnPermissionRequestIssued(const GURL& url,
-                                 const SuccessCallback& callback,
-                                 size_t index,
-                                 bool success);
+  void AddPermissionRequestInternal(
+      const CreatePermissionRequestCallback& create_request,
+      const SuccessCallback& callback,
+      size_t index);
+  void OnPermissionRequestIssued(
+      const CreatePermissionRequestCallback& create_request,
+      const SuccessCallback& callback,
+      size_t index,
+      bool success);
 
   void OnSupervisedUserIdChanged();
 
   void OnDefaultFilteringBehaviorChanged();
 
   void OnSiteListsChanged(
       const std::vector<scoped_refptr<SupervisedUserSiteList>>& site_lists);
 
   // Asynchronously downloads a static blacklist file from |url|, stores it at
   // |path|, loads it, and applies it to the URL filters. If |url| is not valid
@@ skipping 60 matching lines @@
 
   // Used to create permission requests.
   ScopedVector<PermissionRequestCreator> permissions_creators_;
 
   ObserverList<SupervisedUserServiceObserver> observer_list_;
 
   base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_;
 };
 
 #endif  // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_