Revert of mash: Remove ChromeLauncherController's |id_to_item_controller_map_|.

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/common/shelf/shelf_delegate.h"
-#include "ash/common/shelf/shelf_model.h"
 #include "ash/common/wm_window.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.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"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
@@ skipping 169 matching lines @@
 
     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 {
-      ash::ShelfModel* shelf_model = ash::Shell::Get()->shelf_model();
-      shelf_model->SetShelfItemDelegate(shelf_id, std::move(controller));
+      owner()->SetShelfItemDelegate(shelf_id, std::move(controller));
     }
 
     // We need to change the controller associated with app_shelf_id.
     app_controller_map_[app_shelf_id] = item_controller;
   }
   owner()->SetItemStatus(shelf_id, status);
   ash::WmWindow::Get(window)->aura_window()->SetProperty(ash::kShelfIDKey,
                                                          shelf_id);
 }
 
@@ skipping 35 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;
 }