arc: Make Play Store item persistance in shelf.

chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.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/ash/launcher/arc_app_window_launcher_controller.h"
 
 #include "ash/shelf/shelf_util.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/bind.h"
+#include "chrome/browser/chromeos/arc/arc_auth_service.h"
+#include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/exo/shell_surface.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/base/base_window.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
@@ skipping 241 matching lines @@
       ArcAppListPrefs::GetAppId(package_name, activity_name);
 
   ArcAppWindowLauncherItemController* controller;
   AppControllerMap::iterator it = app_controller_map_.find(app_id);
   ash::ShelfID shelf_id = 0;
   if (it != app_controller_map_.end()) {
     controller = it->second;
     DCHECK_EQ(controller->app_id(), app_id);
     shelf_id = controller->shelf_id();
   } else {
-    controller = new ArcAppWindowLauncherItemController(app_id, owner());
-    shelf_id = owner()->GetShelfIDForAppID(app_id);
+    const std::string shelf_app_id =
+        app_id == arc::kPlayStoreAppId ? ArcSupportHost::kHostAppId : app_id;
+    controller =
+        new ArcAppWindowLauncherItemController(shelf_app_id, app_id, owner());
+    shelf_id = owner()->GetShelfIDForAppID(shelf_app_id);
     if (shelf_id == 0) {
-      shelf_id = owner()->CreateAppLauncherItem(controller, app_id,
+      // Map Play Store shelf icon to Arc Support host, to share one entry.
+      shelf_id = owner()->CreateAppLauncherItem(controller, shelf_app_id,
                                                 ash::STATUS_RUNNING);
     } else {
       owner()->SetItemController(shelf_id, controller);
     }
     app_controller_map_[app_id] = controller;
   }
   controller->AddWindow(app_window.get());
   owner()->SetItemStatus(shelf_id, ash::STATUS_RUNNING);
   app_window->SetController(controller);
   app_window->set_shelf_id(shelf_id);
@@ skipping 75 matching lines @@
 
   return nullptr;
 }
 
 void ArcAppWindowLauncherController::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   OnTaskSetActive(active_task_id_);
 }