mash: Remove V1 app shelf item locking; monitor running status instead.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.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_impl.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 340 matching lines @@
     // Existing controller is destroyed and replaced by registering again.
     iter->second = controller;
     SetShelfItemDelegate(id, controller);
   } else {
     LauncherItemClosed(id);
   }
 }
 
 void ChromeLauncherControllerImpl::UnpinShelfItemInternal(ash::ShelfID id) {
   const ash::ShelfItem* item = GetItem(id);
-  LauncherItemController* controller = GetLauncherItemController(id);
-  if (item && (item->status != ash::STATUS_CLOSED || controller->locked()))
+  if (item && item->status != ash::STATUS_CLOSED)
     UnpinRunningAppInternal(model_->ItemIndexByID(id));
   else
     LauncherItemClosed(id);
 }
 
 bool ChromeLauncherControllerImpl::IsPinned(ash::ShelfID id) {
   const ash::ShelfItem* item = GetItem(id);
   return item && ItemTypeIsPinned(*item);
 }
 
-void ChromeLauncherControllerImpl::LockV1AppWithID(const std::string& app_id) {
+void ChromeLauncherControllerImpl::SetV1AppStatus(const std::string& app_id,
+                                                  ash::ShelfItemStatus status) {
   ash::ShelfID id = GetShelfIDForAppID(app_id);
-  if (id == ash::kInvalidShelfID) {
-    CreateAppShortcutLauncherItemWithType(ash::AppLaunchId(app_id),
-                                          model_->item_count(), ash::TYPE_APP);
-    id = GetShelfIDForAppID(app_id);
+  const ash::ShelfItem* item = GetItem(id);
+  if (item) {
+    if (!IsPinned(id) && status == ash::STATUS_CLOSED)
+      LauncherItemClosed(id);
+    else
+      SetItemStatus(id, status);
+  } else if (status != ash::STATUS_CLOSED && !app_id.empty()) {
+    InsertAppLauncherItem(AppShortcutLauncherItemController::Create(
+                              ash::AppLaunchId(app_id), this),
+                          status, model_->item_count(), ash::TYPE_APP);
   }
-  CHECK(id);
-  GetLauncherItemController(id)->lock();
-}
-
-void ChromeLauncherControllerImpl::UnlockV1AppWithID(
-    const std::string& app_id) {
-  ash::ShelfID id = GetShelfIDForAppID(app_id);
-  CHECK_NE(id, ash::kInvalidShelfID);
-  LauncherItemController* controller = GetLauncherItemController(id);
-  controller->unlock();
-  if (!controller->locked() && !IsPinned(id))
-    CloseLauncherItem(id);
 }
 
 void ChromeLauncherControllerImpl::Launch(ash::ShelfID id, int event_flags) {
   LauncherItemController* controller = GetLauncherItemController(id);
   if (!controller)
     return;  // In case invoked from menu and item closed while menu up.
 
   // Launching some items replaces the associated item controller instance,
   // which destroys the app and launch id strings; making copies avoid crashes.
   LaunchApp(ash::AppLaunchId(controller->app_id(), controller->launch_id()),
@@ skipping 537 matching lines @@
   if (ash::Shell::HasInstance())
     SetVirtualKeyboardBehaviorFromPrefs();
 
   prefs_observer_ =
       ash::launcher::ChromeLauncherPrefsObserver::CreateIfNecessary(profile());
 }
 
 ash::ShelfID ChromeLauncherControllerImpl::CreateAppShortcutLauncherItem(
     const ash::AppLaunchId& app_launch_id,
     int index) {
-  return CreateAppShortcutLauncherItemWithType(app_launch_id, index,
-                                               ash::TYPE_PINNED_APP);
+  AppShortcutLauncherItemController* controller =
+      AppShortcutLauncherItemController::Create(app_launch_id, this);
+  return InsertAppLauncherItem(controller, ash::STATUS_CLOSED, index,
+                               ash::TYPE_PINNED_APP);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ChromeLauncherControllerImpl private:
 
 void ChromeLauncherControllerImpl::RememberUnpinnedRunningApplicationOrder() {
   RunningAppListIds list;
   for (int i = 0; i < model_->item_count(); i++) {
     if (model_->items()[i].type == ash::TYPE_APP)
       list.push_back(GetAppIDForShelfID(model_->items()[i].id));
@@ skipping 17 matching lines @@
     if (item && item->type == ash::TYPE_APP) {
       int app_index = model_->ItemIndexByID(item->id);
       DCHECK_GE(app_index, 0);
       if (running_index != app_index)
         model_->Move(running_index, app_index);
       running_index++;
     }
   }
 }
 
-ash::ShelfID
-ChromeLauncherControllerImpl::CreateAppShortcutLauncherItemWithType(
-    const ash::AppLaunchId& app_launch_id,
-    int index,
-    ash::ShelfItemType shelf_item_type) {
-  AppShortcutLauncherItemController* controller =
-      AppShortcutLauncherItemController::Create(app_launch_id, this);
-  return InsertAppLauncherItem(controller, ash::STATUS_CLOSED, index,
-                               shelf_item_type);
-}
-
 void ChromeLauncherControllerImpl::LauncherItemClosed(ash::ShelfID id) {
   IDToItemControllerMap::iterator iter = id_to_item_controller_map_.find(id);
   CHECK(iter != id_to_item_controller_map_.end());
   CHECK(iter->second);
   const std::string& app_id = iter->second->app_id();
   AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
   if (app_icon_loader)
     app_icon_loader->ClearImage(app_id);
   id_to_item_controller_map_.erase(iter);
   int index = model_->ItemIndexByID(id);
@@ skipping 465 matching lines @@
     LauncherItemController* controller = GetLauncherItemController(item.id);
     if (!controller || controller->image_set_by_controller())
       continue;
     item.image = image;
     if (arc_deferred_launcher_)
       arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image);
     model_->Set(index, item);
     // It's possible we're waiting on more than one item, so don't break.
   }
 }