PermissionRequestCreatorApiary: Support for multiple simultaneous requests.

chrome/browser/supervised_user/supervised_user_service.cc

 // 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.
 
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
@@ skipping 147 matching lines @@
       active_(false),
       delegate_(NULL),
 #if defined(ENABLE_EXTENSIONS)
       extension_registry_observer_(this),
 #endif
       waiting_for_sync_initialization_(false),
       is_profile_active_(false),
       elevated_for_testing_(false),
       did_init_(false),
       did_shutdown_(false),
-      waiting_for_permissions_(false),
       weak_ptr_factory_(this) {
 }
 
 SupervisedUserService::~SupervisedUserService() {
   DCHECK(!did_init_ || did_shutdown_);
 }
 
 void SupervisedUserService::Shutdown() {
   if (!did_init_)
     return;
@@ skipping 360 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
   url_filter_context_.LoadWhitelists(GetActiveSiteLists());
 #endif
 }
 
 void SupervisedUserService::LoadBlacklist(const base::FilePath& path) {
   url_filter_context_.LoadBlacklist(path);
 }
 
 bool SupervisedUserService::AccessRequestsEnabled() {
-  if (waiting_for_permissions_)
-    return false;
-
   ProfileSyncService* service =

[Marc Treib, 2014/09/23 11:08:43]

Semi-related: This doesn't make sense if we're using the Apiary creator. Can be
cleaned up in a separate CL though.

[Bernhard Bauer, 2014/09/23 11:56:11]

Yes, and yes. I have a CL that moves this into the PermissionRequestCreator
interface.

       ProfileSyncServiceFactory::GetForProfile(profile_);
   GoogleServiceAuthError::State state = service->GetAuthError().state();
   // We allow requesting access if Sync is working or has a transient error.
   return (state == GoogleServiceAuthError::NONE ||
           state == GoogleServiceAuthError::CONNECTION_FAILED ||
           state == GoogleServiceAuthError::SERVICE_UNAVAILABLE);
 }
 
 void SupervisedUserService::OnPermissionRequestIssued() {
-  waiting_for_permissions_ = false;
   // TODO(akuegel): Figure out how to show the result of issuing the permission
   // request in the UI. Currently, we assume the permission request was created
   // successfully.
 }
 
 void SupervisedUserService::AddAccessRequest(const GURL& url) {
-  waiting_for_permissions_ = true;
   permissions_creator_->CreatePermissionRequest(
       SupervisedUserURLFilter::Normalize(url),
       base::Bind(&SupervisedUserService::OnPermissionRequestIssued,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 SupervisedUserService::ManualBehavior
 SupervisedUserService::GetManualBehaviorForHost(
     const std::string& hostname) {
   const base::DictionaryValue* dict =
@@ skipping 270 matching lines @@
   // The active user can be NULL in unit tests.
   if (user_manager::UserManager::Get()->GetActiveUser()) {
     return UTF16ToUTF8(user_manager::UserManager::Get()->GetUserDisplayName(
         user_manager::UserManager::Get()->GetActiveUser()->GetUserID()));
   }
   return std::string();
 #else
   return profile_->GetPrefs()->GetString(prefs::kProfileName);
 #endif
 }