chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm - Issue 55683002: Instantiate AppShimMenuController when app launcher is enabled. (Mac)

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/cocoa/apps/app_shim_menu_controller_mac.mm

Issue 55683002: Instantiate AppShimMenuController when app launcher is enabled. (Mac) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 1 month 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/cocoa/apps/app_shim_menu_controller_mac.mm

diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm

index 5f3cae94da0f815b70678f1411cc1a74ba22c728..31ce5518bc7821178ec91708326e66e017d0b327 100644

--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm

+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm

@@ -4,6 +4,7 @@

#import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h"

+#include "apps/app_shim/app_shim_mac.h"

#include "apps/app_shim/extension_app_shim_handler_mac.h"

#include "apps/shell_window.h"

#include "apps/shell_window_registry.h"

@@ -277,7 +278,7 @@ void AddDuplicateItem(NSMenuItem* top_level_item,

apps::ShellWindow* shellWindow =

apps::ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile(

window);

- if (shellWindow)

+ if (shellWindow && apps::IsAppShimsEnabled())

[self addMenuItems:shellWindow->extension()];

else

[self removeMenuItems];