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 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 <memory> |
| 11 |
10 #include "base/mac/scoped_nsobject.h" | 12 #include "base/mac/scoped_nsobject.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "ui/app_list/app_list_export.h" | 13 #include "ui/app_list/app_list_export.h" |
13 #import "ui/app_list/cocoa/apps_pagination_model_observer.h" | 14 #import "ui/app_list/cocoa/apps_pagination_model_observer.h" |
14 #import "ui/app_list/cocoa/apps_search_box_controller.h" | 15 #import "ui/app_list/cocoa/apps_search_box_controller.h" |
15 #import "ui/app_list/cocoa/apps_search_results_controller.h" | 16 #import "ui/app_list/cocoa/apps_search_results_controller.h" |
16 | 17 |
17 namespace app_list { | 18 namespace app_list { |
18 class AppListViewDelegate; | 19 class AppListViewDelegate; |
19 class AppListModel; | 20 class AppListModel; |
20 class AppListModelObserverBridge; | 21 class AppListModelObserverBridge; |
21 } | 22 } |
(...skipping 24 matching lines...) Expand all Loading... |
46 base::scoped_nsobject<NSView> backgroundView_; | 47 base::scoped_nsobject<NSView> backgroundView_; |
47 | 48 |
48 // Subview of |backgroundView_| that slides out when search results are shown. | 49 // Subview of |backgroundView_| that slides out when search results are shown. |
49 base::scoped_nsobject<NSView> contentsView_; | 50 base::scoped_nsobject<NSView> contentsView_; |
50 | 51 |
51 // Progress indicator that is visible while the delegate is NULL. | 52 // Progress indicator that is visible while the delegate is NULL. |
52 base::scoped_nsobject<NSProgressIndicator> loadingIndicator_; | 53 base::scoped_nsobject<NSProgressIndicator> loadingIndicator_; |
53 | 54 |
54 app_list::AppListViewDelegate* delegate_; // Weak. Owned by AppListService. | 55 app_list::AppListViewDelegate* delegate_; // Weak. Owned by AppListService. |
55 | 56 |
56 scoped_ptr<app_list::AppListModelObserverBridge> | 57 std::unique_ptr<app_list::AppListModelObserverBridge> |
57 app_list_model_observer_bridge_; | 58 app_list_model_observer_bridge_; |
58 BOOL showingSearchResults_; | 59 BOOL showingSearchResults_; |
59 } | 60 } |
60 | 61 |
61 @property(readonly, nonatomic) AppsSearchBoxController* | 62 @property(readonly, nonatomic) AppsSearchBoxController* |
62 searchBoxController; | 63 searchBoxController; |
63 | 64 |
64 - (app_list::AppListViewDelegate*)delegate; | 65 - (app_list::AppListViewDelegate*)delegate; |
65 - (void)setDelegate:(app_list::AppListViewDelegate*)newDelegate; | 66 - (void)setDelegate:(app_list::AppListViewDelegate*)newDelegate; |
66 - (void)onProfilesChanged; | 67 - (void)onProfilesChanged; |
67 | 68 |
68 @end | 69 @end |
69 | 70 |
70 @interface AppListViewController (TestingAPI) | 71 @interface AppListViewController (TestingAPI) |
71 | 72 |
72 @property(nonatomic, readonly) BOOL showingSearchResults; | 73 @property(nonatomic, readonly) BOOL showingSearchResults; |
73 | 74 |
74 - (AppsGridController*)appsGridController; | 75 - (AppsGridController*)appsGridController; |
75 - (NSSegmentedControl*)pagerControl; | 76 - (NSSegmentedControl*)pagerControl; |
76 - (NSView*)backgroundView; | 77 - (NSView*)backgroundView; |
77 | 78 |
78 @end | 79 @end |
79 | 80 |
80 #endif // UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_ | 81 #endif // UI_APP_LIST_COCOA_APP_LIST_VIEW_CONTROLLER_H_ |
OLD | NEW |