chrome/browser/ui/app_list/app_list_service_mac.h - 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/app_list/app_list_service_mac.h

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/chrome_browser_main_mac.mm ('k') | chrome/browser/ui/app_list/app_list_service_mac_interactive_uitest.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 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_	5 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_

6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_	6 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_

7	7

8 #import <Cocoa/Cocoa.h>	8 #import <Cocoa/Cocoa.h>

9	9

10 #include "apps/app_shim/app_shim_handler_mac.h"

11 #include "base/mac/scoped_nsobject.h"	10 #include "base/mac/scoped_nsobject.h"

12 #include "base/memory/scoped_ptr.h"	11 #include "base/memory/scoped_ptr.h"

	12 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h"

13 #include "chrome/browser/ui/app_list/app_list_service_impl.h"	13 #include "chrome/browser/ui/app_list/app_list_service_impl.h"

14	14

15 class AppListControllerDelegateImpl;	15 class AppListControllerDelegateImpl;

16	16

17 @class AppListAnimationController;	17 @class AppListAnimationController;

18 @class AppListWindowController;	18 @class AppListWindowController;

19 template <typename T> struct DefaultSingletonTraits;	19 template <typename T> struct DefaultSingletonTraits;

20	20

21 namespace gfx {	21 namespace gfx {

22 class Display;	22 class Display;

(...skipping 65 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
88 base::scoped_nsobject<AppListAnimationController> animation_controller_;	88 base::scoped_nsobject<AppListAnimationController> animation_controller_;

89 base::scoped_nsobject<NSRunningApplication> previously_active_application_;	89 base::scoped_nsobject<NSRunningApplication> previously_active_application_;

90 NSPoint last_start_origin_;	90 NSPoint last_start_origin_;

91 Profile* profile_;	91 Profile* profile_;

92 scoped_ptr<AppListControllerDelegateImpl> controller_delegate_;	92 scoped_ptr<AppListControllerDelegateImpl> controller_delegate_;

93	93

94 DISALLOW_COPY_AND_ASSIGN(AppListServiceMac);	94 DISALLOW_COPY_AND_ASSIGN(AppListServiceMac);

95 };	95 };

96	96

97 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_	97 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_

OLD	NEW