mash: Move ownership of ShelfDelegate to WmShell

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/common/shelf/shelf_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf_util.h"
-#include "ash/shell.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"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/common/extension.h"
@@ skipping 136 matching lines @@
         app_shelf_id_to_shelf_id_map_.find(app_shelf_id);
     if (app_shelf_id_iter != app_shelf_id_to_shelf_id_map_.end()) {
       if (owner()->IsPinned(app_shelf_id_iter->second)) {
         shelf_id = app_shelf_id_iter->second;
       } else {
         app_shelf_id_to_shelf_id_map_.erase(app_shelf_id);
       }
     } else if (app_shelf_id == app_id) {
       // show_in_shelf in false and not a panel
       shelf_id =
-          ash::Shell::GetInstance()->GetShelfDelegate()->GetShelfIDForAppID(
-              app_id);
+          ash::WmShell::Get()->shelf_delegate()->GetShelfIDForAppID(app_id);
       // Check if the shelf_id corresponds to an already opened
       // showInShelf=true window that has the same app_id. The current
       // showInShelf=false window should not fold under this shelf item,
       // so the shelf_id is set to 0 to get a new shelf_id.
       auto&& id_map = app_shelf_id_to_shelf_id_map_;
       if (std::find_if(
               id_map.begin(), id_map.end(),
               [shelf_id](const AppShelfIdToShelfIdMap::value_type& pair) {
                 return pair.second == shelf_id;
               }) != id_map.end()) {
@@ skipping 62 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;
 }