Getting rid of ChromeLauncherController::model().

chrome/browser/ui/ash/launcher/extension_launcher_context_menu.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_launcher_context_menu.h"
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate.h"
 #include "base/bind.h"
 #include "chrome/browser/extensions/context_menu_matcher.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/common/context_menu_params.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+namespace ash {
+class ShelfModel;
+}
+
 namespace {
 
 bool MenuItemHasLauncherContext(const extensions::MenuItem* item) {
   return item->contexts().Contains(extensions::MenuItem::LAUNCHER);
 }
 
 }  // namespace
 
 ExtensionLauncherContextMenu::ExtensionLauncherContextMenu(
     ChromeLauncherController* controller,
     const ash::ShelfItem* item,
     ash::Shelf* shelf)
-    : LauncherContextMenu(controller, item, shelf) {
+    : LauncherContextMenu(controller, item, shelf),
+      shelf_model_(shelf->shelf_model()) {
   Init();
 }
 
 ExtensionLauncherContextMenu::~ExtensionLauncherContextMenu() {}
 
 void ExtensionLauncherContextMenu::Init() {
   extension_items_.reset(new extensions::ContextMenuMatcher(
       controller()->profile(), this, this,
       base::Bind(MenuItemHasLauncherContext)));
   if (item().type == ash::TYPE_APP_SHORTCUT ||
@@ skipping 28 matching lines @@
         AddCheckItemWithStringId(LAUNCH_TYPE_FULLSCREEN,
                                  IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED);
       }
     }
   } else if (item().type == ash::TYPE_BROWSER_SHORTCUT) {
     AddItemWithStringId(MENU_NEW_WINDOW, IDS_APP_LIST_NEW_WINDOW);
     if (!controller()->IsLoggedInAsGuest()) {
       AddItemWithStringId(MENU_NEW_INCOGNITO_WINDOW,
                           IDS_APP_LIST_NEW_INCOGNITO_WINDOW);
     }
-    if (!BrowserShortcutLauncherItemController(controller())
+    if (!BrowserShortcutLauncherItemController(controller(), shelf_model_)

[msw, 2016/06/03 20:54:11]

aside: yuck!

              .IsListOfActiveBrowserEmpty()) {
       AddItem(MENU_CLOSE,
               l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
     }
   } else if (item().type == ash::TYPE_DIALOG) {
     AddItemWithStringId(MENU_CLOSE, IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
   } else {
     if (item().type == ash::TYPE_PLATFORM_APP)
       AddPinMenu();
     bool show_close_button = controller()->IsOpen(item().id);
@@ skipping 123 matching lines @@
     case MENU_NEW_INCOGNITO_WINDOW:
       controller()->CreateNewIncognitoWindow();
       break;
     default:
       if (extension_items_) {
         extension_items_->ExecuteCommand(command_id, nullptr, nullptr,
                                          content::ContextMenuParams());
       }
   }
 }