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

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

Issue 492163002: Fix Profile* lifetime issues in Chrome's AppListViewDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add constructor comment 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 | 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 virtual void ShowForProfile(Profile* requested_profile) OVERRIDE; 57 virtual void ShowForProfile(Profile* requested_profile) OVERRIDE;
58 virtual void DismissAppList() OVERRIDE; 58 virtual void DismissAppList() OVERRIDE;
59 virtual bool IsAppListVisible() const OVERRIDE; 59 virtual bool IsAppListVisible() const OVERRIDE;
60 virtual void EnableAppList(Profile* initial_profile, 60 virtual void EnableAppList(Profile* initial_profile,
61 AppListEnableSource enable_source) OVERRIDE; 61 AppListEnableSource enable_source) OVERRIDE;
62 virtual gfx::NativeWindow GetAppListWindow() OVERRIDE; 62 virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
63 virtual AppListControllerDelegate* GetControllerDelegate() OVERRIDE; 63 virtual AppListControllerDelegate* GetControllerDelegate() OVERRIDE;
64 virtual Profile* GetCurrentAppListProfile() OVERRIDE; 64 virtual Profile* GetCurrentAppListProfile() OVERRIDE;
65 virtual void CreateShortcut() OVERRIDE; 65 virtual void CreateShortcut() OVERRIDE;
66 66
67 // AppListServiceImpl overrides:
68 virtual void DestroyAppList() OVERRIDE;
69
67 // AppShimHandler overrides: 70 // AppShimHandler overrides:
68 virtual void OnShimLaunch(apps::AppShimHandler::Host* host, 71 virtual void OnShimLaunch(apps::AppShimHandler::Host* host,
69 apps::AppShimLaunchType launch_type, 72 apps::AppShimLaunchType launch_type,
70 const std::vector<base::FilePath>& files) OVERRIDE; 73 const std::vector<base::FilePath>& files) OVERRIDE;
71 virtual void OnShimClose(apps::AppShimHandler::Host* host) OVERRIDE; 74 virtual void OnShimClose(apps::AppShimHandler::Host* host) OVERRIDE;
72 virtual void OnShimFocus(apps::AppShimHandler::Host* host, 75 virtual void OnShimFocus(apps::AppShimHandler::Host* host,
73 apps::AppShimFocusType focus_type, 76 apps::AppShimFocusType focus_type,
74 const std::vector<base::FilePath>& files) OVERRIDE; 77 const std::vector<base::FilePath>& files) OVERRIDE;
75 virtual void OnShimSetHidden(apps::AppShimHandler::Host* host, 78 virtual void OnShimSetHidden(apps::AppShimHandler::Host* host,
76 bool hidden) OVERRIDE; 79 bool hidden) OVERRIDE;
77 virtual void OnShimQuit(apps::AppShimHandler::Host* host) OVERRIDE; 80 virtual void OnShimQuit(apps::AppShimHandler::Host* host) OVERRIDE;
78 81
79 private: 82 private:
80 friend struct DefaultSingletonTraits<AppListServiceMac>; 83 friend struct DefaultSingletonTraits<AppListServiceMac>;
81 84
82 AppListServiceMac(); 85 AppListServiceMac();
83 86
84 base::scoped_nsobject<AppListWindowController> window_controller_; 87 base::scoped_nsobject<AppListWindowController> window_controller_;
85 base::scoped_nsobject<AppListAnimationController> animation_controller_; 88 base::scoped_nsobject<AppListAnimationController> animation_controller_;
86 base::scoped_nsobject<NSRunningApplication> previously_active_application_; 89 base::scoped_nsobject<NSRunningApplication> previously_active_application_;
87 NSPoint last_start_origin_; 90 NSPoint last_start_origin_;
88 Profile* profile_; 91 Profile* profile_;
89 scoped_ptr<AppListControllerDelegateImpl> controller_delegate_; 92 scoped_ptr<AppListControllerDelegateImpl> controller_delegate_;
90 93
91 DISALLOW_COPY_AND_ASSIGN(AppListServiceMac); 94 DISALLOW_COPY_AND_ASSIGN(AppListServiceMac);
92 }; 95 };
93 96
94 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_ 97 #endif // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SERVICE_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc ('k') | chrome/browser/ui/app_list/app_list_service_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698