chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm - Issue 585123004: Mac: Give app_shim code a nicer home

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 585123004: Mac: Give app_shim code a nicer home (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: various cleanups Created 6 years, 3 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_mac_interactive_uitest.mm ('k') | chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

8 #include "base/mac/scoped_nsautorelease_pool.h"	7 #include "base/mac/scoped_nsautorelease_pool.h"

9 #include "base/strings/sys_string_conversions.h"	8 #include "base/strings/sys_string_conversions.h"

10 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

11 #include "chrome/app/chrome_command_ids.h"	10 #include "chrome/app/chrome_command_ids.h"

	11 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"

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

13 #include "chrome/grit/generated_resources.h"	13 #include "chrome/grit/generated_resources.h"

14 #include "extensions/browser/app_window/app_window.h"	14 #include "extensions/browser/app_window/app_window.h"

15 #include "extensions/browser/app_window/app_window_registry.h"	15 #include "extensions/browser/app_window/app_window_registry.h"

16 #include "extensions/common/extension.h"	16 #include "extensions/common/extension.h"

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

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

19	19

20 namespace {	20 namespace {

21	21

(...skipping 364 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
386	386

387 - (void)focusCurrentPlatformApp {	387 - (void)focusCurrentPlatformApp {

388 extensions::AppWindow* appWindow =	388 extensions::AppWindow* appWindow =

389 extensions::AppWindowRegistry::GetAppWindowForNativeWindowAnyProfile(	389 extensions::AppWindowRegistry::GetAppWindowForNativeWindowAnyProfile(

390 [NSApp keyWindow]);	390 [NSApp keyWindow]);

391 if (appWindow)	391 if (appWindow)

392 apps::ExtensionAppShimHandler::FocusAppForWindow(appWindow);	392 apps::ExtensionAppShimHandler::FocusAppForWindow(appWindow);

393 }	393 }

394	394

395 @end	395 @end

OLD	NEW