ash: Remove ShelfModel id conversion functions.

chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc

 // Copyright (c) 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 "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 
 #include <limits>
 #include <vector>
 
 #include "ash/public/cpp/window_properties.h"
@@ skipping 340 matching lines @@
   browser->window()->Activate();
   return ash::SHELF_ACTION_WINDOW_ACTIVATED;
 }
 
 bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(
     Browser* browser) {
   // Only Ash desktop browser windows for the active user are represented.
   if (!browser || !IsBrowserFromActiveUser(browser))
     return false;
 
-  // v1 App popup windows with a valid app id have their own icon.
-  if (browser->is_app() && browser->is_type_popup() &&
-      !shelf_model_
-           ->GetShelfIDForAppID(
-               web_app::GetExtensionIdFromApplicationName(browser->app_name()))
-           .IsNull()) {
-    return false;
+  // V1 App popup windows may have their own item.
+  if (browser->is_app() && browser->is_type_popup()) {
+    ash::ShelfID id(
+        web_app::GetExtensionIdFromApplicationName(browser->app_name()));
+    if (ChromeLauncherController::instance()->GetItem(id) != nullptr)
+      return false;
   }
 
-  // Settings browsers have their own icon.
-  if (IsSettingsBrowser(browser))
-    return false;
-
-  // Tabbed browser and other popup windows are all represented.
-  return true;
+  // Settings browsers have their own item; all others should be represented.
+  return !IsSettingsBrowser(browser);
 }
 
 BrowserList::BrowserVector
 BrowserShortcutLauncherItemController::GetListOfActiveBrowsers() {
   BrowserList::BrowserVector active_browsers;
   for (auto* browser : *BrowserList::GetInstance()) {
     // Make sure that the browser is from the current user, has a proper window,
     // and the window was already shown.
     if (!IsBrowserFromActiveUser(browser))
       continue;
@@ skipping 17 matching lines @@
   Browser* browser = content::Source<Browser>(source).ptr();
   DCHECK(browser);
   BrowserList::BrowserVector::iterator item = std::find(
       browser_menu_items_.begin(), browser_menu_items_.end(), browser);
   DCHECK(item != browser_menu_items_.end());
   // Clear the entry for the closed browser and leave other indices intact.
   *item = nullptr;
   registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_CLOSING,
                     content::Source<Browser>(browser));
 }