mash: Fold ShelfItemDelegateManager into ShelfModel

ash/sysui/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/sysui/shelf_delegate_mus.h"
 
 #include <memory>
 
 #include "ash/common/shelf/shelf_item_delegate.h"
-#include "ash/common/shelf/shelf_item_delegate_manager.h"
 #include "ash/common/shelf/shelf_menu_model.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_types.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
-#include "ash/shell.h"
 #include "base/strings/string_util.h"
 #include "mojo/common/common_type_converters.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/resources/grit/ui_resources.h"
@@ skipping 118 matching lines @@
   bool pinned_ = false;
   std::map<uint32_t, base::string16> window_id_to_title_;
   base::string16 title_;
   UserWindowController* user_window_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateMus);
 };
 
 ShelfItemDelegateMus* GetShelfItemDelegate(ShelfID shelf_id) {
   return static_cast<ShelfItemDelegateMus*>(
-      Shell::GetInstance()->shelf_item_delegate_manager()->GetShelfItemDelegate(
-          shelf_id));
+      WmShell::Get()->shelf_model()->GetShelfItemDelegate(shelf_id));
 }
 
 // Returns an icon image from an SkBitmap, or the default shelf icon
 // image if the bitmap is empty. Assumes the bitmap is a 1x icon.
 // TODO(jamescook): Support other scale factors.
 gfx::ImageSkia GetShelfIconFromBitmap(const SkBitmap& bitmap) {
   gfx::ImageSkia icon_image;
   if (!bitmap.isNull()) {
     icon_image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
   } else {
@@ skipping 147 matching lines @@
   shelf_item.type = TYPE_APP_SHORTCUT;
   shelf_item.status = STATUS_CLOSED;
   shelf_item.image = GetShelfIconFromBitmap(item->image);
   model_->Add(shelf_item);
 
   std::unique_ptr<ShelfItemDelegateMus> item_delegate(
       new ShelfItemDelegateMus(user_window_controller_.get()));
   item_delegate->SetDelegate(std::move(delegate));
   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));
+  model_->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()) {
@@ skipping 49 matching lines @@
   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));
+  model_->SetShelfItemDelegate(shelf_id, std::move(item_delegate));
 }
 
 void ShelfDelegateMus::OnUserWindowRemoved(uint32_t 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()) {
@@ skipping 65 matching lines @@
   StatusAreaWidget* status_widget = widget->status_area_widget();
   ui::Window* status_window =
       aura::GetMusWindow(status_widget->GetNativeWindow());
   gfx::Size status_size = status_widget->GetWindowBoundsInScreen().size();
   status_window->SetSharedProperty<gfx::Size>(
       ui::mojom::WindowManager::kPreferredSize_Property, status_size);
 }
 
 }  // namespace sysui
 }  // namespace ash