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

chrome/browser/ui/ash/launcher/launcher_item_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <string>
 
 #include "ash/public/cpp/app_launch_id.h"
@@ skipping 18 matching lines @@
 
   ash::ShelfID shelf_id() const { return shelf_id_; }
   void set_shelf_id(ash::ShelfID id) { shelf_id_ = id; }
   const ash::AppLaunchId& app_launch_id() const { return app_launch_id_; }
   const std::string& app_id() const { return app_launch_id_.app_id(); }
   const std::string& launch_id() const { return app_launch_id_.launch_id(); }
   ChromeLauncherController* launcher_controller() const {
     return launcher_controller_;
   }
 
-  // Lock this item to the launcher without being pinned (windowed v1 apps).
-  void lock() { locked_++; }
-  void unlock() {
-    DCHECK(locked_);
-    locked_--;
-  }
-  bool locked() const { return locked_ > 0; }
-
   bool image_set_by_controller() const { return image_set_by_controller_; }
   void set_image_set_by_controller(bool image_set_by_controller) {
     image_set_by_controller_ = image_set_by_controller;
   }
 
   // Returns items for the application menu; used for convenience and testing.
   virtual MenuItemList GetAppMenuItems(int event_flags);
 
   // Returns nullptr if class is not AppWindowLauncherItemController.
   virtual AppWindowLauncherItemController* AsAppWindowLauncherItemController();
 
  private:
   // The app launch id; empty if there is no app associated with the item.
   // Besides the application id, AppLaunchId also contains a launch id, which is
   // an id that can be passed to an app when launched in order to support
   // multiple shelf items per app. This id is used together with the app_id to
   // uniquely identify each shelf item that has the same app_id.
   const ash::AppLaunchId app_launch_id_;
 
   // A unique id assigned by the shelf model for the shelf item.
   ash::ShelfID shelf_id_;
 
   ChromeLauncherController* launcher_controller_;
 
-  // The lock counter which tells the launcher if the item can be removed from
-  // the launcher (0) or not (>0). It is being used for windowed V1
-  // applications.
-  int locked_;
-
   // Set to true if the launcher item image has been set by the controller.
   bool image_set_by_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_