Support the ignored_by_shelf flag for Mus windows.

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 329 matching lines @@
 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));
 
+  if (user_window->ignored_by_shelf)
+    return;
+
   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;
@@ skipping 13 matching lines @@
 
   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));
+  if (!window_id_to_shelf_id_.count(window_id))
+    return;
   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()) {
     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));
+  if (!window_id_to_shelf_id_.count(window_id))
+    return;
   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>());
 
   // There's nothing in the ShelfItem that needs to be updated. But we still
   // need to update the ShelfModel so that the observers can pick up any
   // changes.
   int index = model_->ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
   ShelfItems::const_iterator iter = model_->ItemByID(shelf_id);
   DCHECK(iter != model_->items().end());
   model_->Set(index, *iter);
 }
 
 void ShelfDelegateMus::OnUserWindowAppIconChanged(
     uint32_t window_id,
     mojo::Array<uint8_t> app_icon) {
+  if (!window_id_to_shelf_id_.count(window_id))
+    return;
   // Find the shelf ID for this window.
-  DCHECK(window_id_to_shelf_id_.count(window_id));
   ShelfID shelf_id = window_id_to_shelf_id_[window_id];
   DCHECK_GT(shelf_id, 0);
 
   // Update the icon in the ShelfItem.
   int index = model_->ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
   ShelfItem item = *model_->ItemByID(shelf_id);
   item.image = GetShelfIconFromSerializedBitmap(app_icon);
   model_->Set(index, item);
 }
 
 void ShelfDelegateMus::OnUserWindowFocusChanged(uint32_t window_id,
                                                 bool has_focus) {
-  DCHECK(window_id_to_shelf_id_.count(window_id));
+  if (!window_id_to_shelf_id_.count(window_id))
+    return;
   ShelfID shelf_id = window_id_to_shelf_id_[window_id];
   int index = model_->ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
   ShelfItems::const_iterator iter = model_->ItemByID(shelf_id);
   DCHECK(iter != model_->items().end());
   ShelfItem item = *iter;
   item.status = has_focus ? STATUS_ACTIVE : STATUS_RUNNING;
   model_->Set(index, item);
 }
 
 void ShelfDelegateMus::SetShelfPreferredSizes(Shelf* shelf) {
   ShelfWidget* widget = shelf->shelf_widget();
   ShelfLayoutManager* layout_manager = widget->shelf_layout_manager();
   mus::Window* window = aura::GetMusWindow(widget->GetNativeWindow());
   gfx::Size size = layout_manager->GetIdealBounds().size();
   window->SetSharedProperty<gfx::Size>(
       mus::mojom::WindowManager::kPreferredSize_Property, size);
 
   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