Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: chrome/browser/ui/app_list/app_list_service_mac.h

Issue 55683002: Instantiate AppShimMenuController when app launcher is enabled. (Mac) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Expose InitAppShimMenuController in AppController 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
OLDNEW
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" 10 #include "apps/app_shim/app_shim_handler_mac.h"
(...skipping 25 matching lines...) Expand all
36 virtual void ShowForProfile(Profile* requested_profile) OVERRIDE; 36 virtual void ShowForProfile(Profile* requested_profile) OVERRIDE;
37 virtual void DismissAppList() OVERRIDE; 37 virtual void DismissAppList() OVERRIDE;
38 virtual bool IsAppListVisible() const OVERRIDE; 38 virtual bool IsAppListVisible() const OVERRIDE;
39 virtual gfx::NativeWindow GetAppListWindow() OVERRIDE; 39 virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
40 virtual AppListControllerDelegate* CreateControllerDelegate() OVERRIDE; 40 virtual AppListControllerDelegate* CreateControllerDelegate() OVERRIDE;
41 virtual Profile* GetCurrentAppListProfile() OVERRIDE; 41 virtual Profile* GetCurrentAppListProfile() OVERRIDE;
42 42
43 43
44 // AppListServiceImpl overrides: 44 // AppListServiceImpl overrides:
45 virtual void CreateShortcut() OVERRIDE; 45 virtual void CreateShortcut() OVERRIDE;
46 virtual void EnableAppList(Profile* initial_profile) OVERRIDE;
tapted 2013/11/04 00:49:26 nit: I think this belongs under `AppListService ov
jackhou1 2013/11/04 01:31:37 Done.
46 47
47 // AppShimHandler overrides: 48 // AppShimHandler overrides:
48 virtual void OnShimLaunch(apps::AppShimHandler::Host* host, 49 virtual void OnShimLaunch(apps::AppShimHandler::Host* host,
49 apps::AppShimLaunchType launch_type, 50 apps::AppShimLaunchType launch_type,
50 const std::vector<base::FilePath>& files) OVERRIDE; 51 const std::vector<base::FilePath>& files) OVERRIDE;
51 virtual void OnShimClose(apps::AppShimHandler::Host* host) OVERRIDE; 52 virtual void OnShimClose(apps::AppShimHandler::Host* host) OVERRIDE;
52 virtual void OnShimFocus(apps::AppShimHandler::Host* host, 53 virtual void OnShimFocus(apps::AppShimHandler::Host* host,
53 apps::AppShimFocusType focus_type, 54 apps::AppShimFocusType focus_type,
54 const std::vector<base::FilePath>& files) OVERRIDE; 55 const std::vector<base::FilePath>& files) OVERRIDE;
55 virtual void OnShimSetHidden(apps::AppShimHandler::Host* host, 56 virtual void OnShimSetHidden(apps::AppShimHandler::Host* host,
56 bool hidden) OVERRIDE; 57 bool hidden) OVERRIDE;
57 virtual void OnShimQuit(apps::AppShimHandler::Host* host) OVERRIDE; 58 virtual void OnShimQuit(apps::AppShimHandler::Host* host) OVERRIDE;
58 59
59 private: 60 private:
60 friend struct DefaultSingletonTraits<AppListServiceMac>; 61 friend struct DefaultSingletonTraits<AppListServiceMac>;
61 friend class test::AppListServiceTestApiMac; 62 friend class test::AppListServiceTestApiMac;
62 63
63 AppListServiceMac(); 64 AppListServiceMac();
64 65
65 base::scoped_nsobject<AppListWindowController> window_controller_; 66 base::scoped_nsobject<AppListWindowController> window_controller_;
66 base::scoped_nsobject<AppListAnimationController> animation_controller_; 67 base::scoped_nsobject<AppListAnimationController> animation_controller_;
67 base::scoped_nsobject<NSRunningApplication> previously_active_application_; 68 base::scoped_nsobject<NSRunningApplication> previously_active_application_;
68 NSPoint last_start_origin_; 69 NSPoint last_start_origin_;
69 Profile* profile_; 70 Profile* profile_;
70 71
71 DISALLOW_COPY_AND_ASSIGN(AppListServiceMac); 72 DISALLOW_COPY_AND_ASSIGN(AppListServiceMac);
72 }; 73 };
73 74
74 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_ 75 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698