chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc - Issue 2169533002: mash: Migrate shelf app list button to wm common types

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2169533002: mash: Migrate shelf app list button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 5 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a68146726f4aa965ac211a1ff4c8aa8c7d0657cf..e7d4f16b76b3f9d9ddfd3603254e99eb2c5e2de1 100644

--- a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc

+++ b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc

@@ -5,7 +5,7 @@

#include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h"

#include "ash/common/shelf/shelf_item_delegate.h"

-#include "ash/shell.h"

+#include "ash/common/wm_shell.h"

#include "base/bind.h"

#include "chrome/browser/extensions/context_menu_matcher.h"

#include "chrome/browser/extensions/extension_util.h"

@@ -82,7 +82,7 @@ void ExtensionLauncherContextMenu::Init() {

IDS_APP_LIST_NEW_INCOGNITO_WINDOW);

}

if (!BrowserShortcutLauncherItemController(

- controller(), ash::Shell::GetInstance()->shelf_model())

+ controller(), ash::WmShell::Get()->shelf_model())

.IsListOfActiveBrowserEmpty()) {

AddItem(MENU_CLOSE,

l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));