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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 82 matching lines @@
   // TODO(skuhne): Pass in scoped_ptr to make ownership clear.
   virtual void SetItemController(ash::ShelfID id,
                                  LauncherItemController* controller) = 0;
 
   // Closes or unpins the shelf item.
   virtual void CloseLauncherItem(ash::ShelfID id) = 0;
 
   // Returns true if the item identified by |id| is pinned.
   virtual bool IsPinned(ash::ShelfID id) = 0;
 
-  // If there is no item in the shelf for application |app_id|, one is created.
-  // The (existing or created) shelf items get then locked against a user's
-  // un-pinning removal. Used for V1 apps opened as windows that aren't pinned.
-  virtual void LockV1AppWithID(const std::string& app_id) = 0;
-
-  // A previously locked shelf item of type |app_id| gets unlocked. If the
-  // lock count reaches 0 and the item is not pinned it will go away.
-  virtual void UnlockV1AppWithID(const std::string& app_id) = 0;
+  // Set the shelf item status for the V1 application with the given |app_id|.
+  // Adds or removes an item as needed to respect the running and pinned state.
+  virtual void SetV1AppStatus(const std::string& app_id,
+                              ash::ShelfItemStatus status) = 0;
 
   // Requests that the shelf item controller specified by |id| open a new
   // instance of the app.  |event_flags| holds the flags of the event which
   // triggered this command.
   virtual void Launch(ash::ShelfID id, int event_flags) = 0;
 
   // Closes the specified item.
   virtual void Close(ash::ShelfID id) = 0;
 
   // Returns true if the specified item is open.
@@ skipping 183 matching lines @@
   // An observer that manages the shelf title and icon for settings windows.
   SettingsWindowObserver settings_window_observer_;
 
   // Used to load the images for app items.
   std::vector<std::unique_ptr<AppIconLoader>> app_icon_loaders_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_