mash: Fold ShelfItemDelegateManager into ShelfModel

ash/shelf/shelf_window_watcher.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 "ash/shelf/shelf_window_watcher.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_constants.h"
-#include "ash/common/shelf/shelf_item_delegate_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_window_watcher_item_delegate.h"
 #include "ash/shell.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
@@ skipping 70 matching lines @@
   // and stop observing this |window|.
   window_watcher_->FinishObservingRemovedWindow(window);
 }
 
 void ShelfWindowWatcher::RemovedWindowObserver::OnWindowDestroyed(
     aura::Window* window) {
   DCHECK(HasShelfItemForWindow(window));
   window_watcher_->FinishObservingRemovedWindow(window);
 }
 
-ShelfWindowWatcher::ShelfWindowWatcher(
-    ShelfModel* model,
-    ShelfItemDelegateManager* item_delegate_manager)
+ShelfWindowWatcher::ShelfWindowWatcher(ShelfModel* model)
     : model_(model),
-      item_delegate_manager_(item_delegate_manager),
       root_window_observer_(this),
       removed_window_observer_(this),
       observed_windows_(this),
       observed_root_windows_(&root_window_observer_),
       observed_removed_windows_(&removed_window_observer_),
       observed_activation_clients_(this) {
   // We can't assume all RootWindows have the same ActivationClient.
   // Add a RootWindow and its ActivationClient to the observed list.
   for (aura::Window* root : Shell::GetAllRootWindows())
     OnRootWindowAdded(WmWindowAura::Get(root));
 
   display::Screen::GetScreen()->AddObserver(this);
 }
 
 ShelfWindowWatcher::~ShelfWindowWatcher() {
   display::Screen::GetScreen()->RemoveObserver(this);
 }
 
 void ShelfWindowWatcher::AddShelfItem(aura::Window* window) {
   const ShelfItemDetails* item_details = GetShelfItemDetailsForWindow(window);
   ShelfItem item;
   ShelfID id = model_->next_id();
   item.status = wm::IsActiveWindow(window) ? STATUS_ACTIVE : STATUS_RUNNING;
   SetShelfItemDetailsForShelfItem(&item, *item_details);
   SetShelfIDForWindow(id, window);
   std::unique_ptr<ShelfItemDelegate> item_delegate(
       new ShelfWindowWatcherItemDelegate(window));
-  // |item_delegate| is owned by |item_delegate_manager_|.
-  item_delegate_manager_->SetShelfItemDelegate(id, std::move(item_delegate));
+  model_->SetShelfItemDelegate(id, std::move(item_delegate));
   model_->Add(item);
 }
 
 void ShelfWindowWatcher::RemoveShelfItem(aura::Window* window) {
   model_->RemoveItemAt(model_->ItemIndexByID(GetShelfIDForWindow(window)));
   SetShelfIDForWindow(kInvalidShelfID, window);
 }
 
 void ShelfWindowWatcher::OnRootWindowAdded(WmWindow* root_window_wm) {
   aura::Window* root_window = WmWindowAura::GetAuraWindow(root_window_wm);
@@ skipping 130 matching lines @@
   // When this is called, RootWindow of |old_display| is already removed.
   // Instead, we remove an observer from RootWindow and ActivationClient in the
   // OnRootWindowDestroyed().
   // Do nothing here.
 }
 
 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&,
                                                  uint32_t) {}
 
 }  // namespace ash