Add value proposition entrypoint from Voice Interaction shortcut

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 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/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ skipping 237 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, public:
 
 PrefService* WizardController::local_state_for_testing_ = nullptr;
 
 WizardController::WizardController(LoginDisplayHost* host, OobeUI* oobe_ui)
     : host_(host), oobe_ui_(oobe_ui), weak_factory_(this) {
   DCHECK(default_controller_ == nullptr);
   default_controller_ = this;
   screen_manager_ = base::MakeUnique<ScreenManager>(this);
+  device_marked_registered_ = StartupUtils::IsDeviceRegistered();

[xiyuan, 2017/06/12 17:19:56]

|device_marked_registered_| does not look like related to voice interaction
feature. Can you use an explicit flag instead?

[yueli, 2017/06/12 20:10:07]

How about use IsSessionStarted instead and add comments about it?

   if (!ash_util::IsRunningInMash()) {
     AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
     CHECK(accessibility_manager);
     accessibility_subscription_ = accessibility_manager->RegisterCallback(
         base::Bind(&WizardController::OnAccessibilityStatusChanged,
                    base::Unretained(this)));
   } else {
     NOTIMPLEMENTED();
   }
 }
@@ skipping 553 matching lines @@
   DBusThreadManager::Get()->GetSessionManagerClient()->StopSession();
 }
 
 void WizardController::OnTermsOfServiceAccepted() {
   // If the user accepts the Terms of Service, advance to the PlayStore terms
   // of serice.
   ShowArcTermsOfServiceScreen();
 }
 
 void WizardController::OnArcTermsOfServiceFinished() {
+  const Profile* profile = ProfileManager::GetActiveUserProfile();
+  if (device_marked_registered_) {
+    if (profile->GetPrefs()->GetBoolean(prefs::kArcTermsAccepted))
+      StartVoiceInteractionSetupWizard();
+    OnOobeFlowFinished();
+    return;
+  }
   // If the user finished with the PlayStore Terms of Service, advance to the
   // user image screen.
   ShowUserImageScreen();
 }
 
 void WizardController::OnVoiceInteractionValuePropSkipped() {
   OnOobeFlowFinished();
 }
 
 void WizardController::OnVoiceInteractionValuePropAccepted() {
-  // Start voice interaction setup wizard in container
-  arc::ArcVoiceInteractionFrameworkService* service =
-      arc::ArcServiceManager::Get()
-          ->GetService<arc::ArcVoiceInteractionFrameworkService>();
-  if (service)
-    service->StartVoiceInteractionSetupWizard();
+  const Profile* profile = ProfileManager::GetActiveUserProfile();
+  if (device_marked_registered_ &&
+      !arc::IsArcPlayStoreEnabledForProfile(profile)) {
+    ShowArcTermsOfServiceScreen();
+    return;
+  }
+  StartVoiceInteractionSetupWizard();
   OnOobeFlowFinished();
 }
 
 void WizardController::OnControllerPairingFinished() {
   ShowAutoEnrollmentCheckScreen();
 }
 
 void WizardController::OnAutoEnrollmentCheckCompleted() {
   // Check whether the device is disabled. OnDeviceDisabledChecked() will be
   // invoked when the result of this check is known. Until then, the current
   // screen will remain visible and will continue showing a spinner.
   g_browser_process->platform_part()->device_disabling_manager()->
       CheckWhetherDeviceDisabledDuringOOBE(base::Bind(
           &WizardController::OnDeviceDisabledChecked,
           weak_factory_.GetWeakPtr()));
 }
 
 void WizardController::OnOobeFlowFinished() {
+  if (device_marked_registered_) {
+    host_->SetStatusAreaVisible(true);
+    base::OnceClosure empty_callback = base::BindOnce([] {});
+    host_->Finalize(std::move(empty_callback));

[xiyuan, 2017/06/12 17:19:56]

Since you don't care about the callback, you can just do
  host_->Finalize(base::OnceClosure());

[yueli, 2017/06/12 20:10:07]

Done.

+    host_ = nullptr;
+    return;
+  }
+
   if (!time_oobe_started_.is_null()) {
     base::TimeDelta delta = base::Time::Now() - time_oobe_started_;
     UMA_HISTOGRAM_CUSTOM_TIMES("OOBE.BootToSignInCompleted", delta,
                                base::TimeDelta::FromMilliseconds(10),
                                base::TimeDelta::FromMinutes(30), 100);
     time_oobe_started_ = base::Time();
   }
 
   // Launch browser and delete login host controller.
   BrowserThread::PostTask(
@@ skipping 662 matching lines @@
   }
   if (profile->GetPrefs()->IsManagedPreference(prefs::kArcEnabled) &&
       !profile->GetPrefs()->GetBoolean(prefs::kArcEnabled)) {
     VLOG(1) << "Skip ARC Terms of Service screen because ARC is disabled.";
     return false;
   }
   return true;
 }
 
 bool WizardController::ShouldShowVoiceInteractionValueProp() const {
-  if (!arc::IsArcPlayStoreEnabledForProfile(
+  if (!device_marked_registered_ &&

[xc, 2017/06/09 18:00:14]

Add comment on why we need to do these check this way, it is not obvious.  This
is essentially adding an alternative flow into SUW.

[yueli, 2017/06/12 20:10:07]

Done.

+      !arc::IsArcPlayStoreEnabledForProfile(
           ProfileManager::GetActiveUserProfile())) {
     VLOG(1) << "Skip Voice Interaction Value Prop screen because Arc Terms is "
             << "skipped.";
     return false;
   }
   if (!chromeos::switches::IsVoiceInteractionEnabled()) {
     VLOG(1) << "Skip Voice Interaction Value Prop screen because voice "
             << "interaction service is disabled.";
     return false;
   }
   return true;
 }
 
+void WizardController::StartVoiceInteractionSetupWizard() {
+  arc::ArcVoiceInteractionFrameworkService* service =
+      arc::ArcServiceManager::Get()
+          ->GetService<arc::ArcVoiceInteractionFrameworkService>();
+  if (service)
+    service->StartVoiceInteractionSetupWizard();
+}
+
 void WizardController::MaybeStartListeningForSharkConnection() {
   // We shouldn't be here if we are running pairing OOBE already.
   if (IsControllerDetected())
     return;
 
   if (!shark_connection_listener_) {
     shark_connection_listener_.reset(
         new pairing_chromeos::SharkConnectionListener(
             BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
             base::Bind(&WizardController::OnSharkConnected,
@@ skipping 45 matching lines @@
   SetCurrentScreen(screen);
 }
 
 AutoEnrollmentController* WizardController::GetAutoEnrollmentController() {
   if (!auto_enrollment_controller_)
     auto_enrollment_controller_ = base::MakeUnique<AutoEnrollmentController>();
   return auto_enrollment_controller_.get();
 }
 
 }  // namespace chromeos