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

Unified Diff: ui/app_list/cocoa/app_list_view_controller.h

Issue 508813002: Move ownership of the AppListViewDelegate into the AppListService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix comments 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | ui/app_list/cocoa/app_list_view_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/cocoa/app_list_view_controller.h
diff --git a/ui/app_list/cocoa/app_list_view_controller.h b/ui/app_list/cocoa/app_list_view_controller.h
index 83030e037976525d0527ed12a6284c3f07fe95de..3329dd15060cd71fa377570f4a81683238707c4a 100644
--- a/ui/app_list/cocoa/app_list_view_controller.h
+++ b/ui/app_list/cocoa/app_list_view_controller.h
@@ -46,7 +46,8 @@ APP_LIST_EXPORT
// Progress indicator that is visible while the delegate is NULL.
base::scoped_nsobject<NSProgressIndicator> loadingIndicator_;
- scoped_ptr<app_list::AppListViewDelegate> delegate_;
+ app_list::AppListViewDelegate* delegate_; // Weak. Owned by AppListService.
+
scoped_ptr<app_list::AppListModelObserverBridge>
app_list_model_observer_bridge_;
BOOL showingSearchResults_;
@@ -56,7 +57,7 @@ APP_LIST_EXPORT
searchBoxController;
- (app_list::AppListViewDelegate*)delegate;
-- (void)setDelegate:(scoped_ptr<app_list::AppListViewDelegate>)newDelegate;
+- (void)setDelegate:(app_list::AppListViewDelegate*)newDelegate;
- (void)onProfilesChanged;
@end
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | ui/app_list/cocoa/app_list_view_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698