chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc - Issue 2839933005: mash: Merge ChromeLauncherController and *Impl subclass.

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 2839933005: mash: Merge ChromeLauncherController and *Impl subclass. (Closed)

Patch Set: Address comments. Created 3 years, 8 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:

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 0214be5047a99ee5c7a2cf884f17e7917eaa706c..abdd9f25e170c5813c87a085e60d51df678d9bd9 100644

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

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

@@ -11,7 +11,7 @@

#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_impl.h"

+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"

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

#include "chrome/browser/ui/browser_commands.h"

#include "chrome/common/extensions/extension_constants.h"

@@ -29,7 +29,7 @@ bool MenuItemHasLauncherContext(const extensions::MenuItem* item) {

} // namespace

ExtensionLauncherContextMenu::ExtensionLauncherContextMenu(

- ChromeLauncherControllerImpl* controller,

+ ChromeLauncherController* controller,

const ash::ShelfItem* item,

ash::WmShelf* wm_shelf)

: LauncherContextMenu(controller, item, wm_shelf) {