Fix mash shelf id mapping and removal.

ash/mus/shelf_delegate_mus.cc

 // Copyright 2016 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 "ash/mus/shelf_delegate_mus.h"
 
 #include <memory>
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate.h"
@@ skipping 198 matching lines @@
           shelf->auto_hide_behavior());
   shelf_layout_->SetAutoHideBehavior(behavior);
 
   observers_.ForAllPtrs(
       [behavior](mash::shelf::mojom::ShelfObserver* observer) {
         observer->OnAutoHideBehaviorChanged(behavior);
       });
 }
 
 ShelfID ShelfDelegateMus::GetShelfIDForAppID(const std::string& app_id) {
-  NOTIMPLEMENTED();
+  if (app_id_to_shelf_id_.count(app_id))
+    return app_id_to_shelf_id_[app_id];
   return 0;
 }
 
 bool ShelfDelegateMus::HasShelfIDToAppIDMapping(ShelfID id) const {
-  NOTIMPLEMENTED();
-  return false;
+  return shelf_id_to_app_id_.count(id) != 0;
 }
 
 const std::string& ShelfDelegateMus::GetAppIDForShelfID(ShelfID id) {
-  NOTIMPLEMENTED();
+  if (shelf_id_to_app_id_.count(id))
+    return shelf_id_to_app_id_[id];
   return base::EmptyString();
 }
 
 void ShelfDelegateMus::PinAppWithID(const std::string& app_id) {
   NOTIMPLEMENTED();
 }
 
 bool ShelfDelegateMus::IsAppPinned(const std::string& app_id) {
   NOTIMPLEMENTED();
   return false;
@@ skipping 35 matching lines @@
   std::string app_id(item->app_id.To<std::string>());
   if (app_id_to_shelf_id_.count(app_id)) {
     ShelfID shelf_id = app_id_to_shelf_id_[app_id];
     ShelfItemDelegateMus* item_delegate = GetShelfItemDelegate(shelf_id);
     item_delegate->set_pinned(true);
     return;
   }
 
   ShelfID shelf_id = model_->next_id();
   app_id_to_shelf_id_.insert(std::make_pair(app_id, shelf_id));
+  shelf_id_to_app_id_.insert(std::make_pair(shelf_id, app_id));
 
   ShelfItem shelf_item;
   shelf_item.type = TYPE_APP_SHORTCUT;
   shelf_item.status = STATUS_CLOSED;
   shelf_item.image = GetShelfIconFromBitmap(item->image.To<SkBitmap>());
   model_->Add(shelf_item);
 
   std::unique_ptr<ShelfItemDelegateMus> item_delegate(
       new ShelfItemDelegateMus(user_window_controller_.get()));
   item_delegate->set_pinned(true);
   item_delegate->set_title(item->app_title.To<base::string16>());
   Shell::GetInstance()->shelf_item_delegate_manager()->SetShelfItemDelegate(
       shelf_id, std::move(item_delegate));
 }
 
 void ShelfDelegateMus::UnpinItem(const mojo::String& app_id) {
   if (!app_id_to_shelf_id_.count(app_id.To<std::string>()))
     return;
   ShelfID shelf_id = app_id_to_shelf_id_[app_id.To<std::string>()];
   ShelfItemDelegateMus* item_delegate = GetShelfItemDelegate(shelf_id);
   DCHECK(item_delegate->pinned());
   item_delegate->set_pinned(false);
-  if (item_delegate->window_id_to_title().empty())
+  if (item_delegate->window_id_to_title().empty()) {
     model_->RemoveItemAt(model_->ItemIndexByID(shelf_id));
+    app_id_to_shelf_id_.erase(app_id.To<std::string>());
+    shelf_id_to_app_id_.erase(shelf_id);
+  }
 }
 
 void ShelfDelegateMus::OnUserWindowObserverAdded(
     mojo::Array<mash::wm::mojom::UserWindowPtr> user_windows) {
   for (size_t i = 0; i < user_windows.size(); ++i)
     OnUserWindowAdded(std::move(user_windows[i]));
 }
 
 void ShelfDelegateMus::OnUserWindowAdded(
     mash::wm::mojom::UserWindowPtr user_window) {
   DCHECK(!window_id_to_shelf_id_.count(user_window->window_id));
 
   std::string app_id(user_window->window_app_id.To<std::string>());
   if (app_id_to_shelf_id_.count(app_id)) {
     ShelfID shelf_id = app_id_to_shelf_id_[app_id];
     window_id_to_shelf_id_.insert(
         std::make_pair(user_window->window_id, shelf_id));
 
     ShelfItemDelegateMus* item_delegate = GetShelfItemDelegate(shelf_id);
     item_delegate->AddWindow(user_window->window_id,
                              user_window->window_title.To<base::string16>());
     return;
   }
 
   ShelfID shelf_id = model_->next_id();
   window_id_to_shelf_id_.insert(
       std::make_pair(user_window->window_id, shelf_id));
   app_id_to_shelf_id_.insert(std::make_pair(app_id, shelf_id));
+  shelf_id_to_app_id_.insert(std::make_pair(shelf_id, app_id));
 
   ShelfItem item;
   item.type = TYPE_PLATFORM_APP;
   item.status = user_window->window_has_focus ? STATUS_ACTIVE : STATUS_RUNNING;
   item.image = GetShelfIconFromSerializedBitmap(user_window->window_app_icon);
   model_->Add(item);
 
   std::unique_ptr<ShelfItemDelegateMus> item_delegate(
       new ShelfItemDelegateMus(user_window_controller_.get()));
   item_delegate->AddWindow(user_window->window_id,
                            user_window->window_title.To<base::string16>());
   Shell::GetInstance()->shelf_item_delegate_manager()->SetShelfItemDelegate(
       shelf_id, std::move(item_delegate));
 }
 
 void ShelfDelegateMus::OnUserWindowRemoved(uint32_t window_id) {
   DCHECK(window_id_to_shelf_id_.count(window_id));
   ShelfID shelf_id = window_id_to_shelf_id_[window_id];
   ShelfItemDelegateMus* item_delegate = GetShelfItemDelegate(shelf_id);
   item_delegate->RemoveWindow(window_id);
   window_id_to_shelf_id_.erase(window_id);
-  if (item_delegate->window_id_to_title().empty() && !item_delegate->pinned())
+  if (item_delegate->window_id_to_title().empty() && !item_delegate->pinned()) {
     model_->RemoveItemAt(model_->ItemIndexByID(shelf_id));
+    const std::string& app_id = shelf_id_to_app_id_[shelf_id];
+    app_id_to_shelf_id_.erase(app_id);
+    shelf_id_to_app_id_.erase(shelf_id);
+  }
 }
 
 void ShelfDelegateMus::OnUserWindowTitleChanged(
     uint32_t window_id,
     const mojo::String& window_title) {
   DCHECK(window_id_to_shelf_id_.count(window_id));
   ShelfID shelf_id = window_id_to_shelf_id_[window_id];
   ShelfItemDelegateMus* item_delegate = GetShelfItemDelegate(shelf_id);
   item_delegate->SetWindowTitle(window_id, window_title.To<base::string16>());
 
@@ skipping 47 matching lines @@
   StatusAreaWidget* status_widget = widget->status_area_widget();
   mus::Window* status_window =
       aura::GetMusWindow(status_widget->GetNativeWindow());
   gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size();
   status_window->SetSharedProperty<gfx::Size>(
       mus::mojom::WindowManager::kPreferredSize_Property, status_size);
 }
 
 }  // namespace sysui
 }  // namespace ash