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

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

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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_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 <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 14
14 namespace app_list { 15 namespace app_list {
15 class AppListMenu; 16 class AppListMenu;
16 class AppListModel; 17 class AppListModel;
17 class AppListViewDelegate; 18 class AppListViewDelegate;
18 class SearchBoxModel; 19 class SearchBoxModel;
19 class SearchBoxModelObserverBridge; 20 class SearchBoxModelObserverBridge;
20 } 21 }
21 22
(...skipping 11 matching lines...) Expand all
33 @end 34 @end
34 35
35 // Controller for the search box in the topmost portion of the app list. 36 // Controller for the search box in the topmost portion of the app list.
36 APP_LIST_EXPORT 37 APP_LIST_EXPORT
37 @interface AppsSearchBoxController : NSViewController<NSTextFieldDelegate> { 38 @interface AppsSearchBoxController : NSViewController<NSTextFieldDelegate> {
38 @private 39 @private
39 base::scoped_nsobject<SearchTextField> searchTextField_; 40 base::scoped_nsobject<SearchTextField> searchTextField_;
40 base::scoped_nsobject<NSImageView> searchImageView_; 41 base::scoped_nsobject<NSImageView> searchImageView_;
41 base::scoped_nsobject<HoverImageMenuButton> menuButton_; 42 base::scoped_nsobject<HoverImageMenuButton> menuButton_;
42 base::scoped_nsobject<AppListMenuController> menuController_; 43 base::scoped_nsobject<AppListMenuController> menuController_;
43 scoped_ptr<app_list::SearchBoxModelObserverBridge> bridge_; 44 std::unique_ptr<app_list::SearchBoxModelObserverBridge> bridge_;
44 scoped_ptr<app_list::AppListMenu> appListMenu_; 45 std::unique_ptr<app_list::AppListMenu> appListMenu_;
45 46
46 id<AppsSearchBoxDelegate> delegate_; // Weak. Owns us. 47 id<AppsSearchBoxDelegate> delegate_; // Weak. Owns us.
47 } 48 }
48 49
49 @property(assign, nonatomic) id<AppsSearchBoxDelegate> delegate; 50 @property(assign, nonatomic) id<AppsSearchBoxDelegate> delegate;
50 51
51 - (id)initWithFrame:(NSRect)frame; 52 - (id)initWithFrame:(NSRect)frame;
52 - (void)clearSearch; 53 - (void)clearSearch;
53 54
54 // Rebuild the menu due to changes from the AppListViewDelegate. 55 // Rebuild the menu due to changes from the AppListViewDelegate.
55 - (void)rebuildMenu; 56 - (void)rebuildMenu;
56 57
57 @end 58 @end
58 59
59 @interface AppsSearchBoxController (TestingAPI) 60 @interface AppsSearchBoxController (TestingAPI)
60 61
61 - (NSTextField*)searchTextField; 62 - (NSTextField*)searchTextField;
62 - (NSPopUpButton*)menuControl; 63 - (NSPopUpButton*)menuControl;
63 - (app_list::AppListMenu*)appListMenu; 64 - (app_list::AppListMenu*)appListMenu;
64 65
65 @end 66 @end
66 67
67 #endif // UI_APP_LIST_COCOA_APPS_SEARCH_BOX_CONTROLLER_H_ 68 #endif // UI_APP_LIST_COCOA_APPS_SEARCH_BOX_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/app_list/cocoa/apps_grid_view_item.h ('k') | ui/app_list/cocoa/apps_search_results_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698