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

Side by Side Diff: ui/app_list/cocoa/apps_grid_controller.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 5 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 UI_APP_LIST_COCOA_APPS_GRID_CONTROLLER_H_ 5 #ifndef UI_APP_LIST_COCOA_APPS_GRID_CONTROLLER_H_
6 #define UI_APP_LIST_COCOA_APPS_GRID_CONTROLLER_H_ 6 #define UI_APP_LIST_COCOA_APPS_GRID_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/memory/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "ui/app_list/app_list_export.h" 12 #include "ui/app_list/app_list_export.h"
13 #import "ui/app_list/cocoa/app_list_pager_view.h" 13 #import "ui/app_list/cocoa/app_list_pager_view.h"
14 #import "ui/app_list/cocoa/scroll_view_with_no_scrollbars.h" 14 #import "ui/app_list/cocoa/scroll_view_with_no_scrollbars.h"
15 15
16 namespace app_list { 16 namespace app_list {
17 class AppListModel; 17 class AppListModel;
18 class AppListViewDelegate; 18 class AppListViewDelegate;
19 class AppsGridDelegateBridge; 19 class AppsGridDelegateBridge;
20 } 20 }
21 21
22 @class AppsGridViewItem; 22 @class AppsGridViewItem;
23 @protocol AppsPaginationModelObserver; 23 @protocol AppsPaginationModelObserver;
24 @class AppsCollectionViewDragManager; 24 @class AppsCollectionViewDragManager;
25 25
26 // Controls a grid of views, representing AppListModel::Apps sub models. 26 // Controls a grid of views, representing AppListModel::Apps sub models.
27 APP_LIST_EXPORT 27 APP_LIST_EXPORT
28 @interface AppsGridController : NSViewController<GestureScrollDelegate, 28 @interface AppsGridController : NSViewController<GestureScrollDelegate,
29 AppListPagerDelegate> { 29 AppListPagerDelegate> {
30 @private 30 @private
31 scoped_ptr<app_list::AppListModel> model_; 31 scoped_ptr<app_list::AppListModel> model_;
32 app_list::AppListViewDelegate* delegate_; // Weak. Owned by view controller. 32 app_list::AppListViewDelegate* delegate_; // Weak. Owned by view controller.
33 scoped_ptr<app_list::AppsGridDelegateBridge> bridge_; 33 scoped_ptr<app_list::AppsGridDelegateBridge> bridge_;
34 34
35 scoped_nsobject<AppsCollectionViewDragManager> dragManager_; 35 base::scoped_nsobject<AppsCollectionViewDragManager> dragManager_;
36 scoped_nsobject<NSMutableArray> pages_; 36 base::scoped_nsobject<NSMutableArray> pages_;
37 scoped_nsobject<NSMutableArray> items_; 37 base::scoped_nsobject<NSMutableArray> items_;
38 scoped_nsobject<NSTimer> scrollWhileDraggingTimer_; 38 base::scoped_nsobject<NSTimer> scrollWhileDraggingTimer_;
39 39
40 id<AppsPaginationModelObserver> paginationObserver_; 40 id<AppsPaginationModelObserver> paginationObserver_;
41 41
42 // Index of the currently visible page. 42 // Index of the currently visible page.
43 size_t visiblePage_; 43 size_t visiblePage_;
44 // The page to which the view is currently animating a scroll. 44 // The page to which the view is currently animating a scroll.
45 size_t targetScrollPage_; 45 size_t targetScrollPage_;
46 // The page to start scrolling to when the timer expires. 46 // The page to start scrolling to when the timer expires.
47 size_t scheduledScrollPage_; 47 size_t scheduledScrollPage_;
48 48
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 @end 116 @end
117 117
118 @interface AppsGridController(TestingAPI) 118 @interface AppsGridController(TestingAPI)
119 119
120 - (AppsCollectionViewDragManager*)dragManager; 120 - (AppsCollectionViewDragManager*)dragManager;
121 - (size_t)scheduledScrollPage; 121 - (size_t)scheduledScrollPage;
122 122
123 @end 123 @end
124 124
125 #endif // UI_APP_LIST_COCOA_APPS_GRID_CONTROLLER_H_ 125 #endif // UI_APP_LIST_COCOA_APPS_GRID_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698