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

Side by Side Diff: ui/app_list/cocoa/apps_search_box_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, 6 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_SEARCH_BOX_CONTROLLER_H_ 5 #ifndef UI_APP_LIST_COCOA_APPS_SEARCH_BOX_CONTROLLER_H_
6 #define UI_APP_LIST_COCOA_APPS_SEARCH_BOX_CONTROLLER_H_ 6 #define UI_APP_LIST_COCOA_APPS_SEARCH_BOX_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 13
14 namespace app_list { 14 namespace app_list {
15 class AppListMenu; 15 class AppListMenu;
16 class AppListViewDelegate; 16 class AppListViewDelegate;
17 class SearchBoxModel; 17 class SearchBoxModel;
18 class SearchBoxModelObserverBridge; 18 class SearchBoxModelObserverBridge;
19 } 19 }
20 20
21 @class AppListMenuController; 21 @class AppListMenuController;
22 @class HoverImageMenuButton; 22 @class HoverImageMenuButton;
23 @class SearchTextField; 23 @class SearchTextField;
24 24
25 @protocol AppsSearchBoxDelegate<NSTextFieldDelegate> 25 @protocol AppsSearchBoxDelegate<NSTextFieldDelegate>
26 26
27 - (app_list::AppListViewDelegate*)appListDelegate; 27 - (app_list::AppListViewDelegate*)appListDelegate;
28 - (app_list::SearchBoxModel*)searchBoxModel; 28 - (app_list::SearchBoxModel*)searchBoxModel;
29 - (void)modelTextDidChange; 29 - (void)modelTextDidChange;
30 30
31 @end 31 @end
32 32
33 // Controller for the search box in the topmost portion of the app list. 33 // Controller for the search box in the topmost portion of the app list.
34 APP_LIST_EXPORT 34 APP_LIST_EXPORT
35 @interface AppsSearchBoxController : NSViewController<NSTextFieldDelegate> { 35 @interface AppsSearchBoxController : NSViewController<NSTextFieldDelegate> {
36 @private 36 @private
37 scoped_nsobject<SearchTextField> searchTextField_; 37 base::scoped_nsobject<SearchTextField> searchTextField_;
38 scoped_nsobject<NSImageView> searchImageView_; 38 base::scoped_nsobject<NSImageView> searchImageView_;
39 scoped_nsobject<HoverImageMenuButton> menuButton_; 39 base::scoped_nsobject<HoverImageMenuButton> menuButton_;
40 scoped_nsobject<AppListMenuController> menuController_; 40 base::scoped_nsobject<AppListMenuController> menuController_;
41 scoped_ptr<app_list::SearchBoxModelObserverBridge> bridge_; 41 scoped_ptr<app_list::SearchBoxModelObserverBridge> bridge_;
42 scoped_ptr<app_list::AppListMenu> appListMenu_; 42 scoped_ptr<app_list::AppListMenu> appListMenu_;
43 43
44 id<AppsSearchBoxDelegate> delegate_; // Weak. Owns us. 44 id<AppsSearchBoxDelegate> delegate_; // Weak. Owns us.
45 } 45 }
46 46
47 @property(assign, nonatomic) id<AppsSearchBoxDelegate> delegate; 47 @property(assign, nonatomic) id<AppsSearchBoxDelegate> delegate;
48 48
49 - (id)initWithFrame:(NSRect)frame; 49 - (id)initWithFrame:(NSRect)frame;
50 - (void)clearSearch; 50 - (void)clearSearch;
51 51
52 @end 52 @end
53 53
54 @interface AppsSearchBoxController (TestingAPI) 54 @interface AppsSearchBoxController (TestingAPI)
55 55
56 - (NSTextField*)searchTextField; 56 - (NSTextField*)searchTextField;
57 - (NSPopUpButton*)menuControl; 57 - (NSPopUpButton*)menuControl;
58 - (app_list::AppListMenu*)appListMenu; 58 - (app_list::AppListMenu*)appListMenu;
59 59
60 @end 60 @end
61 61
62 #endif // UI_APP_LIST_COCOA_APPS_SEARCH_BOX_CONTROLLER_H_ 62 #endif // UI_APP_LIST_COCOA_APPS_SEARCH_BOX_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698