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

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

Issue 2145813002: Clear old ARC instance before opt-in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/arc/arc_auth_service.cc
diff --git a/chrome/browser/chromeos/arc/arc_auth_service.cc b/chrome/browser/chromeos/arc/arc_auth_service.cc
index b9e6986c54d8648191e565c52f478c4d283041e0..487941efb8198ee5c321b8c1caeee3afcba7dc08 100644
--- a/chrome/browser/chromeos/arc/arc_auth_service.cc
+++ b/chrome/browser/chromeos/arc/arc_auth_service.cc
@@ -663,6 +663,16 @@ void ArcAuthService::DisableArc() {
void ArcAuthService::StartUI() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ if (!arc_bridge_service()->stopped()) {
+ // If the user attempts to re-enable ARC while the bridge is still running
+ // data must be explicitly cleared and the user should not be able to
+ // continue until after the bridge has stopped.
+ clear_required_ = true;
hidehiko 2016/07/14 05:11:26 For the record of the offline chat. Could you tak
+ ShowUI(UIPage::ERROR, l10n_util::GetStringUTF16(
+ IDS_ARC_SIGN_IN_SERVICE_UNAVAILABLE_ERROR));
+ return;
+ }
+
SetState(State::FETCHING_CODE);
if (initial_opt_in_) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698