arc: Make Play Store item persistance in shelf.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

 // Copyright 2013 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/chrome_launcher_controller.h"
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/multi_profile_uma.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_app_icon_loader.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service_syncable_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
+#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/app_sync_ui_state.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
@@ skipping 124 matching lines @@
         if (app_id == app_id_)
           return false;
       }
     }
   }
   // Default, user added new pins
   return true;
 }
 
 const char* const kPinProhibitedExtensionIds[] = {
-    "cnbgggchhmkkdmeppjobngjoejnihlei",  // Arc Support
+    ArcSupportHost::kHostAppId, arc::kPlayStoreAppId,
 };
 
 const size_t kPinProhibitedExtensionIdsLength =
     arraysize(kPinProhibitedExtensionIds);
 
 }  // namespace
 
 // A class to get events from ChromeOS when a user gets changed or added.
 class ChromeLauncherControllerUserSwitchObserver
     : public user_manager::UserManager::UserSessionStateObserver {
@@ skipping 243 matching lines @@
 }
 
 void ChromeLauncherController::CloseLauncherItem(ash::ShelfID id) {
   CHECK(id);
   if (IsPinned(id)) {
     // Create a new shortcut controller.
     IDToItemControllerMap::iterator iter = id_to_item_controller_map_.find(id);
     CHECK(iter != id_to_item_controller_map_.end());
     SetItemStatus(id, ash::STATUS_CLOSED);
     std::string app_id = iter->second->app_id();
-    iter->second = new AppShortcutLauncherItemController(app_id, this);
+    iter->second = AppShortcutLauncherItemController::Create(app_id, this);
     iter->second->set_shelf_id(id);
     // Existing controller is destroyed and replaced by registering again.
     SetShelfItemDelegate(id, iter->second);
   } else {
     LauncherItemClosed(id);
   }
 }
 
 AppListControllerDelegate::Pinnable ChromeLauncherController::GetPinnable(
     const std::string& app_id) {
@@ skipping 167 matching lines @@
   ash::ShelfID id = GetShelfIDForAppID(app_id);
   if (id) {
     LauncherItemController* controller = GetLauncherItemController(id);
     controller->Activate(source);
     return;
   }
 
   // Create a temporary application launcher item and use it to see if there are
   // running instances.
   std::unique_ptr<AppShortcutLauncherItemController> app_controller(
-      new AppShortcutLauncherItemController(app_id, this));
+      AppShortcutLauncherItemController::Create(app_id, this));
   if (!app_controller->GetRunningApplications().empty())
     app_controller->Activate(source);
   else
     LaunchApp(app_id, source, event_flags);
 }
 
 extensions::LaunchType ChromeLauncherController::GetLaunchType(
     ash::ShelfID id) {
   const Extension* extension = GetExtensionForAppID(GetAppIDForShelfID(id));
 
@@ skipping 149 matching lines @@
 
     const base::ListValue* policy_pinned_apps_pref =
         profile_->GetPrefs()->GetList(prefs::kPolicyPinnedLauncherApps);
 
     ListPrefUpdate updater(profile_->GetPrefs(), prefs::kPinnedLauncherApps);
     updater->Clear();
     for (size_t i = 0; i < model_->items().size(); ++i) {
       if (model_->items()[i].type == ash::TYPE_APP_SHORTCUT) {
         ash::ShelfID id = model_->items()[i].id;
         LauncherItemController* controller = GetLauncherItemController(id);
-        if (controller && IsPinned(id)) {
+        if (controller && IsPinned(id) &&
+            GetPinnable(controller->app_id()) !=
+                AppListControllerDelegate::NO_PIN) {

[xiyuan, 2016/05/13 15:16:34]

It is funny to see that an item is pinned but it is also not pinnable. Maybe add
a comment to explain?

[khmel, 2016/05/13 16:01:49]

Agree :), There are 2 items here with special handling, Chrome and App Launcher.
I tried to insert to that workflow first. However result was too massive and
code was not readable. I used current approach and it worked quite well. We have
TODO already to refactore AppListControllerDelegate:: pin constants. May be
solution is to extend, by adding something like PIN_INTERNAL. Best to do in
separate CL, imho.

[xiyuan, 2016/05/13 16:10:06]

Acknowledged.

           base::DictionaryValue* app_value = ash::CreateAppDict(
               controller->app_id());
           if (app_value) {
             if (!IsAppForUserPinned(controller->app_id(),
                                     pinned_apps_pref.get(),
                                     policy_pinned_apps_pref))
               app_value->SetBoolean(ash::kPinnedAppsPrefPinnedByPolicy, true);
             updater->Append(app_value);
           }
         }
@@ skipping 474 matching lines @@
       }
     }
   }
 }
 
 ash::ShelfID ChromeLauncherController::CreateAppShortcutLauncherItemWithType(
     const std::string& app_id,
     int index,
     ash::ShelfItemType shelf_item_type) {
   AppShortcutLauncherItemController* controller =
-      new AppShortcutLauncherItemController(app_id, this);
+      AppShortcutLauncherItemController::Create(app_id, this);
   ash::ShelfID shelf_id = InsertAppLauncherItem(
       controller, app_id, ash::STATUS_CLOSED, index, shelf_item_type);
   return shelf_id;
 }
 
 LauncherItemController* ChromeLauncherController::GetLauncherItemController(
     const ash::ShelfID id) {
   if (!HasShelfIDToAppIDMapping(id))
     return NULL;
   return id_to_item_controller_map_[id];
@@ skipping 580 matching lines @@
 
 AppIconLoader* ChromeLauncherController::GetAppIconLoaderForApp(
     const std::string& app_id) {
   for (const auto& app_icon_loader : app_icon_loaders_) {
     if (app_icon_loader->CanLoadImageForApp(app_id))
       return app_icon_loader.get();
   }
 
   return nullptr;
 }