chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm - Issue 15239002: Move Extension and PermissionsData to extensions/common.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

7 #include "apps/app_shim/extension_app_shim_handler_mac.h"	7 #include "apps/app_shim/extension_app_shim_handler_mac.h"

8 #include "apps/shell_window.h"	8 #include "apps/shell_window.h"

9 #include "apps/shell_window_registry.h"	9 #include "apps/shell_window_registry.h"

10 #include "base/strings/sys_string_conversions.h"	10 #include "base/strings/sys_string_conversions.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "chrome/app/chrome_command_ids.h"	12 #include "chrome/app/chrome_command_ids.h"

13 #import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"	13 #import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"

14 #include "chrome/common/extensions/extension.h"	14 #include "extensions/common/extension.h"

15 #include "grit/generated_resources.h"	15 #include "grit/generated_resources.h"

16 #include "ui/base/l10n/l10n_util.h"	16 #include "ui/base/l10n/l10n_util.h"

17 #include "ui/base/l10n/l10n_util_mac.h"	17 #include "ui/base/l10n/l10n_util_mac.h"

18	18

19 namespace {	19 namespace {

20	20

21 // Gets an item from the main menu given the tag of the top level item	21 // Gets an item from the main menu given the tag of the top level item

22 // \|menu_tag\| and the tag of the item \|item_tag\|.	22 // \|menu_tag\| and the tag of the item \|item_tag\|.

23 NSMenuItem* GetItemByTag(NSInteger menu_tag, NSInteger item_tag) {	23 NSMenuItem* GetItemByTag(NSInteger menu_tag, NSInteger item_tag) {

24 return [[[[NSApp mainMenu] itemWithTag:menu_tag] submenu]	24 return [[[[NSApp mainMenu] itemWithTag:menu_tag] submenu]

(...skipping 342 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
367	367

368 - (void)focusCurrentPlatformApp {	368 - (void)focusCurrentPlatformApp {

369 apps::ShellWindow* shellWindow =	369 apps::ShellWindow* shellWindow =

370 apps::ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile(	370 apps::ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile(

371 [NSApp keyWindow]);	371 [NSApp keyWindow]);

372 if (shellWindow)	372 if (shellWindow)

373 apps::ExtensionAppShimHandler::FocusAppForWindow(shellWindow);	373 apps::ExtensionAppShimHandler::FocusAppForWindow(shellWindow);

374 }	374 }

375	375

376 @end	376 @end

OLD	NEW