mash: Remove ShelfDelegate; move functions to ShelfModel.

chrome/browser/ui/ash/launcher/extension_app_window_launcher_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 "chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h"
 
-#include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_window.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h"
@@ skipping 106 matching lines @@
 // which destroys AppWindow, so both |window| and the associated AppWindow
 // are valid here.
 void ExtensionAppWindowLauncherController::OnWindowDestroying(
     aura::Window* window) {
   UnregisterApp(window);
 }
 
 void ExtensionAppWindowLauncherController::RegisterApp(AppWindow* app_window) {
   // Windows created by IME extension should be treated the same way as the
   // virtual keyboard window, which does not register itself in launcher.
-  if (app_window->is_ime_window())
+  // Ash's ShelfWindowWatcher handles app panel windows separately.
+  if (app_window->is_ime_window() || app_window->window_type_is_panel())
     return;
 
-  // Ash's ShelfWindowWatcher handles app panel windows separately.
-  if (app_window->window_type_is_panel()) {
-    // Load panel app icons now. ShelfWindowWatcher cannot easily trigger this,
-    // and ShelfModel::Set cannot be called in ShelfItemAdded, since ShelfView
-    // may not have added a view for the new shelf item at that point.
-    const std::string& app_id = app_window->extension_id();
-    AppIconLoader* app_icon_loader = owner()->GetAppIconLoaderForApp(app_id);
-    if (app_icon_loader) {
-      app_icon_loader->FetchImage(app_id);
-      app_icon_loader->UpdateImage(app_id);
-    }
-    return;
-  }
-
   aura::Window* window = app_window->GetNativeWindow();
   // Get the app's shelf identifier and add an entry to the map.
   DCHECK(window_to_app_shelf_id_map_.find(window) ==
          window_to_app_shelf_id_map_.end());
   const std::string app_shelf_id = GetAppShelfId(app_window);
   window_to_app_shelf_id_map_[window] = app_shelf_id;
   window->AddObserver(this);
 
   // Find or create an item controller and launcher item.
   std::string app_id = app_window->extension_id();
@@ skipping 14 matching lines @@
     std::string launch_id = GetLaunchId(app_window);
     std::unique_ptr<ExtensionAppWindowLauncherItemController> controller =
         base::MakeUnique<ExtensionAppWindowLauncherItemController>(
             ash::AppLaunchId(app_id, launch_id));
     ExtensionAppWindowLauncherItemController* item_controller =
         controller.get();
 
     controller->AddAppWindow(app_window);
     // If there is already a shelf id mapped to this AppLaunchId (e.g. pinned),
     // use that shelf item.
-    shelf_id =
-        ash::Shell::Get()->shelf_delegate()->GetShelfIDForAppIDAndLaunchID(
-            app_id, launch_id);
+    shelf_id = ash::Shell::Get()->shelf_model()->GetShelfIDForAppIDAndLaunchID(
+        app_id, launch_id);
 
     if (shelf_id == 0) {
       shelf_id = owner()->CreateAppLauncherItem(std::move(controller), status);
       // Restore any existing app icon and flag as set.
       if (app_window->HasCustomIcon() && !app_window->app_icon().IsEmpty()) {
         owner()->SetLauncherItemImage(shelf_id,
                                       app_window->app_icon().AsImageSkia());
         item_controller->set_image_set_by_controller(true);
       }
     } else {
@@ skipping 47 matching lines @@
   WindowToAppShelfIdMap::iterator window_iter =
       window_to_app_shelf_id_map_.find(window);
   if (window_iter == window_to_app_shelf_id_map_.end())
     return nullptr;
   AppControllerMap::iterator app_controller_iter =
       app_controller_map_.find(window_iter->second);
   if (app_controller_iter == app_controller_map_.end())
     return nullptr;
   return app_controller_iter->second;
 }