[Merge-M53] arc: Make Play Store item persistent in app list.

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 <string>
 
 #include "ash/shell.h"
 #include "base/bind.h"
@@ skipping 144 matching lines @@
     // Now that we are done, we can delete ourselves.
     delete this;
   }
 
   DISALLOW_COPY_AND_ASSIGN(LaunchAppWithoutSize);
 };
 
 }  // namespace
 
 const char kPlayStoreAppId[] = "gpkmicpkkebkmabiaedjognfppcchdfa";
+const char kPlayStorePackage[] = "com.android.vending";
+const char kPlayStoreActivity[] = "com.android.vending.AssetBrowserActivity";
 const char kSettingsAppId[] = "mconboelelhjpkbdhhiijkgcimoangdj";
 
 bool ShouldShowInLauncher(const std::string& app_id) {
   return (app_id != kSettingsAppId);
 }
 
 bool LaunchAppWithRect(content::BrowserContext* context,
                        const std::string& app_id,
                        const gfx::Rect& target_rect) {
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context);
@@ skipping 36 matching lines @@
   return arc::LaunchApp(context, kSettingsAppId, kUseLandscapeLayout);
 }
 
 bool LaunchApp(content::BrowserContext* context, const std::string& app_id) {
   return LaunchApp(context, app_id, true);
 }
 
 bool LaunchApp(content::BrowserContext* context,
                const std::string& app_id,
                bool landscape_layout) {
-  const ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context);
+  ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context);
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = prefs->GetApp(app_id);
   if (app_info && !app_info->ready) {
-    if (!ash::Shell::HasInstance())
-      return false;
-
     ArcAuthService* auth_service = ArcAuthService::Get();
     DCHECK(auth_service);
 
+    bool arc_activated = false;
     if (!auth_service->IsArcEnabled()) {
       if (!prefs->IsDefault(app_id)) {
         NOTREACHED();
         return false;
       }
 
       auth_service->EnableArc();
       if (!auth_service->IsArcEnabled()) {
         NOTREACHED();
         return false;
       }
+      arc_activated = true;
     }
 
-    ChromeLauncherController* chrome_controller =
-        ChromeLauncherController::instance();
-    DCHECK(chrome_controller);
-    chrome_controller->GetArcDeferredLauncher()->RegisterDeferredLaunch(app_id);
+    // PlayStore item has special handling for shelf controllers. In order to
+    // avoid unwanted initial animation for PlayStore item do not create
+    // deferred launch request when PlayStore item enables Arc.
+    if (!arc_activated || app_id != kPlayStoreAppId) {
+      ChromeLauncherController* chrome_controller =
+          ChromeLauncherController::instance();
+      DCHECK(chrome_controller || !ash::Shell::HasInstance());
+      if (chrome_controller) {
+        chrome_controller->GetArcDeferredLauncher()->RegisterDeferredLaunch(
+            app_id);
+      }
+    }
+    prefs->SetLastLaunchTime(app_id, base::Time::Now());
     return true;
   }
 
   return (new LaunchAppWithoutSize(context, app_id, landscape_layout))
       ->LaunchAndRelease();
 }
 
 void SetTaskActive(int task_id) {
   arc::mojom::AppInstance* app_instance =
       GetAppInstance(kTaskSupportMinVersion, kSetActiveTaskStr);
@@ skipping 78 matching lines @@
   if (!app_instance)
     return false;
 
   app_instance->ShowPackageInfoOnPage(
       package_name, page,
       GetTargetRect(gfx::Size(kNexus7Width, kNexus7Height)));
   return true;
 }
 
 }  // namespace arc