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

Unified Diff: chrome/browser/chromeos/arc/arc_android_management_checker.cc

Issue 2108643007: Revert of arc: Implement silent OptIn mode for managed Arc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/arc/arc_android_management_checker.cc
diff --git a/chrome/browser/chromeos/arc/arc_android_management_checker.cc b/chrome/browser/chromeos/arc/arc_android_management_checker.cc
index 1bff14f9689852738e3579f450e92266dba8dcdd..fca4ff739842546b9663d232c4c78172980c22b5 100644
--- a/chrome/browser/chromeos/arc/arc_android_management_checker.cc
+++ b/chrome/browser/chromeos/arc/arc_android_management_checker.cc
@@ -13,10 +13,9 @@
#include "components/policy/core/common/cloud/device_management_service.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
-namespace arc {
-
namespace {
+constexpr int kRefreshTokenTimeoutMs = 10 * 1000; // 10 sec.
constexpr int kRetryTimeMinMs = 10 * 1000; // 10 sec.
constexpr int kRetryTimeMaxMs = 1 * 60 * 60 * 1000; // 1 hour.
@@ -31,7 +30,7 @@
ArcAndroidManagementChecker::ArcAndroidManagementChecker(
ArcAndroidManagementCheckerDelegate* delegate,
ProfileOAuth2TokenService* token_service,
- const std::string& account_id,
+ const std::string account_id,
bool background_mode)
: delegate_(delegate),
token_service_(token_service),
@@ -46,8 +45,12 @@
if (token_service_->RefreshTokenIsAvailable(account_id_)) {
StartCheck();
} else {
- DCHECK(background_mode_);
token_service_->AddObserver(this);
+ if (!background_mode_) {
+ refresh_token_timeout_.Start(
+ FROM_HERE, base::TimeDelta::FromMilliseconds(kRefreshTokenTimeoutMs),
+ this, &ArcAndroidManagementChecker::OnRefreshTokenTimeout);
+ }
}
}
@@ -68,6 +71,14 @@
}
void ArcAndroidManagementChecker::OnRefreshTokensLoaded() {
+ token_service_->RemoveObserver(this);
+ refresh_token_timeout_.Stop();
+ StartCheck();
+}
+
+void ArcAndroidManagementChecker::OnRefreshTokenTimeout() {
+ DCHECK(!background_mode_);
+ VLOG(2) << "Failed to wait for refresh token for android management check.";
token_service_->RemoveObserver(this);
StartCheck();
}
@@ -120,5 +131,3 @@
FROM_HERE, base::Bind(&ArcAndroidManagementChecker::DispatchResult,
weak_ptr_factory_.GetWeakPtr(), result));
}
-
-} // namespace arc

Powered by Google App Engine
This is Rietveld 408576698