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

Side by Side 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 unified diff | Download patch
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 UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_ 5 #ifndef UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_
6 #define UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_ 6 #define UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
(...skipping 28 matching lines...) Expand all
39 39
40 // Subview for drawing the background. 40 // Subview for drawing the background.
41 base::scoped_nsobject<NSView> backgroundView_; 41 base::scoped_nsobject<NSView> backgroundView_;
42 42
43 // Subview of |backgroundView_| that slides out when search results are shown. 43 // Subview of |backgroundView_| that slides out when search results are shown.
44 base::scoped_nsobject<NSView> contentsView_; 44 base::scoped_nsobject<NSView> contentsView_;
45 45
46 // Progress indicator that is visible while the delegate is NULL. 46 // Progress indicator that is visible while the delegate is NULL.
47 base::scoped_nsobject<NSProgressIndicator> loadingIndicator_; 47 base::scoped_nsobject<NSProgressIndicator> loadingIndicator_;
48 48
49 scoped_ptr<app_list::AppListViewDelegate> delegate_; 49 app_list::AppListViewDelegate* delegate_; // Weak. Owned by AppListService.
50
50 scoped_ptr<app_list::AppListModelObserverBridge> 51 scoped_ptr<app_list::AppListModelObserverBridge>
51 app_list_model_observer_bridge_; 52 app_list_model_observer_bridge_;
52 BOOL showingSearchResults_; 53 BOOL showingSearchResults_;
53 } 54 }
54 55
55 @property(readonly, nonatomic) AppsSearchBoxController* 56 @property(readonly, nonatomic) AppsSearchBoxController*
56 searchBoxController; 57 searchBoxController;
57 58
58 - (app_list::AppListViewDelegate*)delegate; 59 - (app_list::AppListViewDelegate*)delegate;
59 - (void)setDelegate:(scoped_ptr<app_list::AppListViewDelegate>)newDelegate; 60 - (void)setDelegate:(app_list::AppListViewDelegate*)newDelegate;
60 - (void)onProfilesChanged; 61 - (void)onProfilesChanged;
61 62
62 @end 63 @end
63 64
64 @interface AppListViewController (TestingAPI) 65 @interface AppListViewController (TestingAPI)
65 66
66 @property(nonatomic, readonly) BOOL showingSearchResults; 67 @property(nonatomic, readonly) BOOL showingSearchResults;
67 68
68 - (AppsGridController*)appsGridController; 69 - (AppsGridController*)appsGridController;
69 - (NSSegmentedControl*)pagerControl; 70 - (NSSegmentedControl*)pagerControl;
70 - (NSView*)backgroundView; 71 - (NSView*)backgroundView;
71 72
72 @end 73 @end
73 74
74 #endif // UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_ 75 #endif // UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_
OLDNEW
« 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