arc: Handle closing OptIn window for managed Arc.

chrome/browser/chromeos/arc/arc_auth_service.cc

 // Copyright 2015 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/chromeos/arc/arc_auth_service.h"
 
 #include <utility>
 
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shell.h"
@@ skipping 434 matching lines @@
                                      : OptInActionType::OPTED_OUT);
 
     if (!disable_arc_from_ui_ && !arc_enabled && !IsArcManaged()) {
       ash::ShelfDelegate* shelf_delegate = GetShelfDelegate();
       if (shelf_delegate)
         shelf_delegate->UnpinAppWithID(ArcSupportHost::kHostAppId);
     }
   }
 }
 
+void ArcAuthService::StopArc() {
+  if (state_ != State::STOPPED) {
+    UpdateEnabledStateUMA(false);
+    profile_->GetPrefs()->SetBoolean(prefs::kArcSignedIn, false);
+  }
+  ShutdownBridgeAndCloseUI();
+}
+
 void ArcAuthService::OnOptInPreferenceChanged() {
   DCHECK(thread_checker.Get().CalledOnValidThread());
   DCHECK(profile_);
 
   const bool arc_enabled = IsArcEnabled();
   FOR_EACH_OBSERVER(Observer, observer_list_, OnOptInEnabled(arc_enabled));
 
   if (!arc_enabled) {
-    if (state_ != State::STOPPED) {
-      UpdateEnabledStateUMA(false);
-      profile_->GetPrefs()->SetBoolean(prefs::kArcSignedIn, false);
-    }
-    ShutdownBridgeAndCloseUI();
+    StopArc();
     return;
   }
 
   if (state_ == State::ACTIVE)
     return;
   CloseUI();
   auth_code_.clear();
 
   if (!profile_->GetPrefs()->GetBoolean(prefs::kArcSignedIn)) {
     // Need pre-fetch auth code and show OptIn UI if needed.
@@ skipping 100 matching lines @@
     ShutdownBridge();
   }
 
   initial_opt_in_ = false;
   StartUI();
 }
 
 void ArcAuthService::CancelAuthCode() {
   DCHECK(thread_checker.Get().CalledOnValidThread());
 
-  if (ui_page_ == UIPage::ERROR_WITH_FEEDBACK) {
-    ShutdownBridge();
-    if (profile_->GetPrefs()->HasPrefPath(prefs::kArcSignedIn))
-      profile_->GetPrefs()->SetBoolean(prefs::kArcSignedIn, false);
+  if (state_ == State::NOT_INITIALIZED) {
+    NOTREACHED();
+    return;
   }
 
+  // In case |state_| is ACTIVE, |ui_page_| can be START_PROGRESS (which means
+  // normal Arc booting) or  ERROR or ERROR_WITH_FEEDBACK (in case Arc can not
+  // be started). If Arc is booting normally dont't stop it on progress close.
   if (state_ != State::FETCHING_CODE && ui_page_ != UIPage::ERROR &&
-      ui_page_ != UIPage::ERROR_WITH_FEEDBACK)
+      ui_page_ != UIPage::ERROR_WITH_FEEDBACK) {
     return;
+  }
 
   // Update UMA with user cancel only if error is not currently shown.
-  if (ui_page_ != UIPage::ERROR && ui_page_ != UIPage::NO_PAGE)
+  if (ui_page_ != UIPage::ERROR && ui_page_ == UIPage::ERROR_WITH_FEEDBACK &&
+      ui_page_ != UIPage::NO_PAGE) {
     UpdateOptInCancelUMA(OptInCancelReason::USER_CANCEL);
+  }
+
+  StopArc();
+
+  if (IsArcManaged())
+    return;
 
   base::AutoReset<bool> auto_reset(&disable_arc_from_ui_, true);
   DisableArc();
 }
 
 bool ArcAuthService::IsArcManaged() const {
   DCHECK(thread_checker.Get().CalledOnValidThread());
   DCHECK(profile_);
   return profile_->GetPrefs()->IsManagedPreference(prefs::kArcEnabled);
 }
 
 bool ArcAuthService::IsArcEnabled() const {
   DCHECK(thread_checker.Get().CalledOnValidThread());
   DCHECK(profile_);
   return profile_->GetPrefs()->GetBoolean(prefs::kArcEnabled);
 }
 
 void ArcAuthService::EnableArc() {
   DCHECK(thread_checker.Get().CalledOnValidThread());
   DCHECK(profile_);
-  profile_->GetPrefs()->SetBoolean(prefs::kArcEnabled, true);
+
+  if (!IsArcEnabled()) {
+    if (IsArcManaged())
+      return;
+    profile_->GetPrefs()->SetBoolean(prefs::kArcEnabled, true);
+  } else {
+    OnOptInPreferenceChanged();
+  }
 }
 
 void ArcAuthService::DisableArc() {
   DCHECK(thread_checker.Get().CalledOnValidThread());
   DCHECK(profile_);
   profile_->GetPrefs()->SetBoolean(prefs::kArcEnabled, false);

[mtomasz, 2016/07/20 03:46:25]

Why isn't there a "if (IsArcManaged())" guard like in #637? Is it intentional?

[khmel, 2016/07/20 16:50:41]

This has no effect for managed Arc. Probably for consistency we may add it.

 }
 
 void ArcAuthService::StartUI() {
   DCHECK(thread_checker.Get().CalledOnValidThread());
 
   SetState(State::FETCHING_CODE);
 
   if (initial_opt_in_) {
     initial_opt_in_ = false;
     ShowUI(UIPage::START, base::string16());
@@ skipping 80 matching lines @@
       return os << kStateFetchingCode;
     case ArcAuthService::State::ACTIVE:
       return os << kStateActive;
     default:
       NOTREACHED();
       return os;
   }
 }
 
 }  // namespace arc