mash: Make ShelfWindowWatcher items for unknown windows.

ash/shelf/shelf_controller.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/shelf/shelf_controller.h"
 
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/remote_shelf_item_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
@@ skipping 110 matching lines @@
                                           int64_t display_id) {
   Shelf* shelf = GetShelfForDisplay(display_id);
   // TODO(jamescook): The session state check should not be necessary, but
   // otherwise this wrongly tries to set auto-hide state on a secondary display
   // during login.
   if (shelf && Shell::Get()->session_controller()->IsActiveUserSessionStarted())
     shelf->SetAutoHideBehavior(auto_hide);
 }
 
 void ShelfController::AddShelfItem(int32_t index, const ShelfItem& item) {
-  DCHECK_EQ(Shell::GetAshConfig(), Config::MASH) << "Unexpected model sync";
-  DCHECK(!applying_remote_shelf_model_changes_) << "Unexpected model change";
+  DCHECK_EQ(Shell::GetAshConfig(), Config::MASH) << " Unexpected model sync";
+  DCHECK(!applying_remote_shelf_model_changes_) << " Unexpected model change";
   index = index < 0 ? model_.item_count() : index;
-  DCHECK_GT(index, 0) << "Items can not preceed the AppList";
-  DCHECK_LE(index, model_.item_count()) << "Index out of bounds";
+  DCHECK_GT(index, 0) << " Items can not preceed the AppList";
+  DCHECK_LE(index, model_.item_count()) << " Index out of bounds";
   index = std::min(std::max(index, 1), model_.item_count());
   base::AutoReset<bool> reset(&applying_remote_shelf_model_changes_, true);
   model_.AddAt(index, item);
 }
 
 void ShelfController::RemoveShelfItem(const ShelfID& id) {
-  DCHECK_EQ(Shell::GetAshConfig(), Config::MASH) << "Unexpected model sync";
-  DCHECK(!applying_remote_shelf_model_changes_) << "Unexpected model change";
+  DCHECK_EQ(Shell::GetAshConfig(), Config::MASH) << " Unexpected model sync";
+  DCHECK(!applying_remote_shelf_model_changes_) << " Unexpected model change";
   const int index = model_.ItemIndexByID(id);
-  DCHECK_GE(index, 0) << "Item not found";
-  DCHECK_NE(index, 0) << "The AppList shelf item cannot be removed";
+  DCHECK_GE(index, 0) << " No item found with the id: " << id;
+  DCHECK_NE(index, 0) << " The AppList shelf item cannot be removed";
   if (index <= 0)
     return;
   base::AutoReset<bool> reset(&applying_remote_shelf_model_changes_, true);
   model_.RemoveItemAt(index);
 }
 
 void ShelfController::MoveShelfItem(const ShelfID& id, int32_t index) {
-  DCHECK_EQ(Shell::GetAshConfig(), Config::MASH) << "Unexpected model sync";
-  DCHECK(!applying_remote_shelf_model_changes_) << "Unexpected model change";
+  DCHECK_EQ(Shell::GetAshConfig(), Config::MASH) << " Unexpected model sync";
+  DCHECK(!applying_remote_shelf_model_changes_) << " Unexpected model change";
   const int current_index = model_.ItemIndexByID(id);
-  DCHECK_GE(current_index, 0) << "No item found with the given id";
-  DCHECK_NE(current_index, 0) << "The AppList shelf item cannot be moved";
+  DCHECK_GE(current_index, 0) << " No item found with the id: " << id;
+  DCHECK_NE(current_index, 0) << " The AppList shelf item cannot be moved";
   if (current_index <= 0)
     return;
-  DCHECK_GT(index, 0) << "Items can not preceed the AppList";
-  DCHECK_LT(index, model_.item_count()) << "Index out of bounds";
+  DCHECK_GT(index, 0) << " Items can not preceed the AppList";
+  DCHECK_LT(index, model_.item_count()) << " Index out of bounds";
   index = std::min(std::max(index, 1), model_.item_count() - 1);
-  DCHECK_NE(current_index, index) << "The item is already at the given index";
+  DCHECK_NE(current_index, index) << " The item is already at the given index";
   if (current_index == index)
     return;
   base::AutoReset<bool> reset(&applying_remote_shelf_model_changes_, true);
   model_.Move(current_index, index);
 }
 
 void ShelfController::UpdateShelfItem(const ShelfItem& item) {
-  DCHECK_EQ(Shell::GetAshConfig(), Config::MASH) << "Unexpected model sync";
-  DCHECK(!applying_remote_shelf_model_changes_) << "Unexpected model change";
+  DCHECK_EQ(Shell::GetAshConfig(), Config::MASH) << " Unexpected model sync";
+  DCHECK(!applying_remote_shelf_model_changes_) << " Unexpected model change";
   const int index = model_.ItemIndexByID(item.id);
-  DCHECK_GE(index, 0) << "No item found with the given id";
+  DCHECK_GE(index, 0) << " No item found with the id: " << item.id;
   if (index < 0)
     return;
   base::AutoReset<bool> reset(&applying_remote_shelf_model_changes_, true);
   model_.Set(index, item);
 }
 
 void ShelfController::SetShelfItemDelegate(
     const ShelfID& id,
     mojom::ShelfItemDelegatePtr delegate) {
-  DCHECK_EQ(Shell::GetAshConfig(), Config::MASH) << "Unexpected model sync";
-  DCHECK(!applying_remote_shelf_model_changes_) << "Unexpected model change";
+  DCHECK_EQ(Shell::GetAshConfig(), Config::MASH) << " Unexpected model sync";
+  DCHECK(!applying_remote_shelf_model_changes_) << " Unexpected model change";
   base::AutoReset<bool> reset(&applying_remote_shelf_model_changes_, true);
   if (delegate.is_bound())
     model_.SetShelfItemDelegate(
         id, base::MakeUnique<RemoteShelfItemDelegate>(id, std::move(delegate)));
   else
     model_.SetShelfItemDelegate(id, nullptr);
 }
 
 void ShelfController::ShelfItemAdded(int index) {
   if (applying_remote_shelf_model_changes_ ||
@@ skipping 50 matching lines @@
   }
 
   observers_.ForAllPtrs([id, delegate](mojom::ShelfObserver* observer) {
     observer->OnShelfItemDelegateChanged(
         id, delegate ? delegate->CreateInterfacePtrAndBind()
                      : mojom::ShelfItemDelegatePtr());
   });
 }
 
 }  // namespace ash