mash: Make ShelfWindowWatcher items for unknown windows.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.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/chrome_launcher_controller.h"
 
 #include "ash/multi_profile_uma.h"
 #include "ash/public/cpp/remote_shelf_item_delegate.h"
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/public/cpp/shelf_model.h"
@@ skipping 1265 matching lines @@
     ash::ShelfAutoHideBehavior auto_hide,
     int64_t display_id) {
   DCHECK(!updating_shelf_pref_from_observer_);
   base::AutoReset<bool> updating(&updating_shelf_pref_from_observer_, true);
   // This will uselessly store a preference value for invalid display ids.
   SetShelfAutoHideBehaviorPref(profile_->GetPrefs(), display_id, auto_hide);
 }
 
 void ChromeLauncherController::OnShelfItemAdded(int32_t index,
                                                 const ash::ShelfItem& item) {
-  DCHECK(ash_util::IsRunningInMash()) << "Unexpected model synchronization";
-  DCHECK(!applying_remote_shelf_model_changes_) << "Unexpected model change";
+  DCHECK(ash_util::IsRunningInMash()) << " Unexpected model synchronization";
+  DCHECK(!applying_remote_shelf_model_changes_) << " Unexpected model change";
 
   // Ignore notifications of adding the AppList item; it should already exist.
   if (item.id.app_id == ash::kAppListId) {
     DCHECK_EQ(0, model_->ItemIndexByID(item.id));
     return;
   }
 
-  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";
+  DCHECK_GT(index, 0) << " Items can not preceed the AppList";
   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 ChromeLauncherController::OnShelfItemRemoved(const ash::ShelfID& id) {
-  DCHECK(ash_util::IsRunningInMash()) << "Unexpected model synchronization";
-  DCHECK(!applying_remote_shelf_model_changes_) << "Unexpected model change";
+  DCHECK(ash_util::IsRunningInMash()) << " Unexpected model synchronization";
+  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 ChromeLauncherController::OnShelfItemMoved(const ash::ShelfID& id,
                                                 int32_t index) {
-  DCHECK(ash_util::IsRunningInMash()) << "Unexpected model synchronization";
-  DCHECK(!applying_remote_shelf_model_changes_) << "Unexpected model change";
+  DCHECK(ash_util::IsRunningInMash()) << " Unexpected model synchronization";
+  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 ChromeLauncherController::OnShelfItemUpdated(const ash::ShelfItem& item) {
-  DCHECK(ash_util::IsRunningInMash()) << "Unexpected model synchronization";
-  DCHECK(!applying_remote_shelf_model_changes_) << "Unexpected model change";
+  DCHECK(ash_util::IsRunningInMash()) << " Unexpected model synchronization";
+  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 ChromeLauncherController::OnShelfItemDelegateChanged(
     const ash::ShelfID& id,
     ash::mojom::ShelfItemDelegatePtr delegate) {
-  DCHECK(ash_util::IsRunningInMash()) << "Unexpected model synchronization";
-  DCHECK(!applying_remote_shelf_model_changes_) << "Unexpected model change";
+  DCHECK(ash_util::IsRunningInMash()) << " Unexpected model synchronization";
+  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<ash::RemoteShelfItemDelegate>(
                                      id, std::move(delegate)));
   } else {
     model_->SetShelfItemDelegate(id, nullptr);
   }
 }
 
@@ skipping 135 matching lines @@
           : IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE);
 
   const int app_list_index = model_->GetItemIndexForType(ash::TYPE_APP_LIST);
   DCHECK_GE(app_list_index, 0);
   ash::ShelfItem item = model_->items()[app_list_index];
   if (item.title != title) {
     item.title = title;
     model_->Set(app_list_index, item);
   }
 }