Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(404)

Unified Diff: chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc

Issue 2039543002: Getting rid of ChromeLauncherController::model(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing git cl dependencies Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
diff --git a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
index 202c93bc3853e554ff6fd9bbaf397d2a5c662141..ff189ac7e51621f1ea2fcde1151654e71fb97ea0 100644
--- a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
@@ -19,6 +19,10 @@
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
+namespace ash {
+class ShelfModel;
+}
+
namespace {
bool MenuItemHasLauncherContext(const extensions::MenuItem* item) {
@@ -31,7 +35,8 @@ 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();
}
@@ -80,7 +85,7 @@ void ExtensionLauncherContextMenu::Init() {
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));
« ash/shelf/shelf.h ('K') | « chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698