Index: chrome/browser/supervised_user/supervised_user_service.cc |
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc |
index 0017d8cba68084a984b0b5885dc88393f60bb503..616a52cbb409ffd4647f8aaa96f463cdf98e52e2 100644 |
--- a/chrome/browser/supervised_user/supervised_user_service.cc |
+++ b/chrome/browser/supervised_user/supervised_user_service.cc |
@@ -165,7 +165,6 @@ SupervisedUserService::SupervisedUserService(Profile* profile) |
elevated_for_testing_(false), |
did_init_(false), |
did_shutdown_(false), |
- waiting_for_permissions_(false), |
weak_ptr_factory_(this) { |
} |
@@ -546,9 +545,6 @@ void SupervisedUserService::LoadBlacklist(const base::FilePath& 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 usi
Bernhard Bauer
2014/09/23 11:56:11
Yes, and yes. I have a CL that moves this into the
|
ProfileSyncServiceFactory::GetForProfile(profile_); |
GoogleServiceAuthError::State state = service->GetAuthError().state(); |
@@ -559,14 +555,12 @@ bool SupervisedUserService::AccessRequestsEnabled() { |
} |
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, |