arc: Reactivate OptIn flow on clicking Play Store.

chrome/browser/ui/app_list/arc/arc_app_utils.cc

 // Copyright 2016 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/ui/app_list/arc/arc_app_utils.h"
 
 #include <memory>
 #include <string>
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_shelf_id.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service_manager.h"
@@ skipping 257 matching lines @@
         // deferred launch request when PlayStore item enables Google Play
         // Store.
         if (app_id == kPlayStoreAppId) {
           prefs->SetLastLaunchTime(app_id, base::Time::Now());
           return true;
         }
       } else {
         // Only reachable when ARC always starts.
         DCHECK(arc::ShouldArcAlwaysStart());
       }
+    } else {
+      // Handle the case when default app tries to re-activate OptIn flow.
+      if (IsArcPlayStoreEnabledPreferenceManagedForProfile(profile) &&
+          !ArcSessionManager::Get()->enable_requested() &&
+          prefs->IsDefault(app_id)) {
+        SetArcPlayStoreEnabledForProfile(profile, true);
+        if (app_id == kPlayStoreAppId) {

[Yusuke Sato, 2017/03/13 18:05:56]

qq: When this can be false? Is it okay to execute L298 even when this evaluates
to false?

[khmel, 2017/03/13 19:44:19]

Another default app may activate this flow, for example ArtCanvas. In this case
we have spinning animation for ArtCanvas. Play Store is also implemented as
default app. We have OptIn UI for this flow and don't show animation in shelf.
Return here is just exit earlier and don't register deferred launcher which is
responsible for spinning animation. Similar to L285

[Yusuke Sato, 2017/03/13 20:08:18]

Can you copy the summary of your comment to the code as a code comment? This was
not immediately obvious to me.

[khmel, 2017/03/13 21:42:34]

Done.

+          prefs->SetLastLaunchTime(app_id, base::Time::Now());
+          return true;
+        }
+      }
     }
 
     ChromeLauncherController* chrome_controller =
         ChromeLauncherController::instance();
     DCHECK(chrome_controller || !ash::Shell::HasInstance());
     if (chrome_controller) {
       chrome_controller->GetArcDeferredLauncher()->RegisterDeferredLaunch(
           app_id, event_flags);
 
       // On some boards, ARC is booted with a restricted set of resources by
@@ skipping 135 matching lines @@
     return false;
 
   const ArcAppListPrefs* const arc_prefs = ArcAppListPrefs::Get(context);
   if (!arc_prefs)
     return false;
 
   return arc_prefs->IsRegistered(ArcAppShelfId::FromString(id).app_id());
 }
 
 }  // namespace arc