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

chrome/browser/ui/ash/launcher/browser_status_monitor.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/browser_status_monitor.h"
 
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 241 matching lines @@
   RemoveWebContentsObserver(contents);
 }
 
 void BrowserStatusMonitor::AddV1AppToShelf(Browser* browser) {
   DCHECK(browser->is_type_popup() && browser->is_app());
   DCHECK(initialized_);
 
   std::string app_id =
       web_app::GetExtensionIdFromApplicationName(browser->app_name());
   if (!app_id.empty()) {
+    if (!IsV1AppInShelfWithAppId(app_id))
+      launcher_controller_->SetV1AppStatus(app_id, ash::STATUS_RUNNING);
     browser_to_app_id_map_[browser] = app_id;
-    launcher_controller_->LockV1AppWithID(app_id);
   }
 }
 
 void BrowserStatusMonitor::RemoveV1AppFromShelf(Browser* browser) {
   DCHECK(browser->is_type_popup() && browser->is_app());
   DCHECK(initialized_);
 
-  if (browser_to_app_id_map_.find(browser) != browser_to_app_id_map_.end()) {
-    launcher_controller_->UnlockV1AppWithID(browser_to_app_id_map_[browser]);
-    browser_to_app_id_map_.erase(browser);
+  auto iter = browser_to_app_id_map_.find(browser);
+  if (iter != browser_to_app_id_map_.end()) {
+    std::string app_id = iter->second;
+    browser_to_app_id_map_.erase(iter);
+    if (!IsV1AppInShelfWithAppId(app_id))
+      launcher_controller_->SetV1AppStatus(app_id, ash::STATUS_CLOSED);
   }
 }
 
 bool BrowserStatusMonitor::IsV1AppInShelf(Browser* browser) {
   return browser_to_app_id_map_.find(browser) != browser_to_app_id_map_.end();
 }
 
+bool BrowserStatusMonitor::IsV1AppInShelfWithAppId(const std::string& app_id) {
+  for (const auto& iter : browser_to_app_id_map_) {
+    if (iter.second == app_id)
+      return true;
+  }
+  return false;
+}
+
 void BrowserStatusMonitor::AddWebContentsObserver(
     content::WebContents* contents) {
   if (webcontents_to_observer_map_.find(contents) ==
           webcontents_to_observer_map_.end()) {
     webcontents_to_observer_map_[contents] =
         base::MakeUnique<LocalWebContentsObserver>(contents, this);
   }
 }
 
 void BrowserStatusMonitor::RemoveWebContentsObserver(
     content::WebContents* contents) {
   DCHECK(webcontents_to_observer_map_.find(contents) !=
       webcontents_to_observer_map_.end());
   webcontents_to_observer_map_.erase(contents);
 }
 
 ash::ShelfID BrowserStatusMonitor::GetShelfIDForWebContents(
     content::WebContents* contents) {
   return launcher_controller_->GetShelfIDForWebContents(contents);
 }
 
 void BrowserStatusMonitor::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
   launcher_controller_->GetBrowserShortcutLauncherItemController()->
       SetShelfIDForBrowserWindowContents(browser, web_contents);
 }