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

Side by Side Diff: ui/app_list/cocoa/apps_grid_view_item.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_GRID_VIEW_ITEM_H_ 5 #ifndef UI_APP_LIST_COCOA_APPS_GRID_VIEW_ITEM_H_
6 #define UI_APP_LIST_COCOA_APPS_GRID_VIEW_ITEM_H_ 6 #define UI_APP_LIST_COCOA_APPS_GRID_VIEW_ITEM_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include <memory>
11
11 #include "ui/app_list/app_list_export.h" 12 #include "ui/app_list/app_list_export.h"
12 #import "ui/base/cocoa/tracking_area.h" 13 #import "ui/base/cocoa/tracking_area.h"
13 14
14 namespace app_list { 15 namespace app_list {
15 class AppListItem; 16 class AppListItem;
16 class ItemModelObserverBridge; 17 class ItemModelObserverBridge;
17 } 18 }
18 19
19 // AppsGridViewItem is the controller for an NSButton representing an app item 20 // AppsGridViewItem is the controller for an NSButton representing an app item
20 // on an NSCollectionView controlled by an AppsGridController. 21 // on an NSCollectionView controlled by an AppsGridController.
21 APP_LIST_EXPORT 22 APP_LIST_EXPORT
22 @interface AppsGridViewItem : NSCollectionViewItem { 23 @interface AppsGridViewItem : NSCollectionViewItem {
23 @private 24 @private
24 scoped_ptr<app_list::ItemModelObserverBridge> observerBridge_; 25 std::unique_ptr<app_list::ItemModelObserverBridge> observerBridge_;
25 base::scoped_nsobject<NSProgressIndicator> progressIndicator_; 26 base::scoped_nsobject<NSProgressIndicator> progressIndicator_;
26 27
27 // Used to highlight the background on hover. 28 // Used to highlight the background on hover.
28 ui::ScopedCrTrackingArea trackingArea_; 29 ui::ScopedCrTrackingArea trackingArea_;
29 } 30 }
30 31
31 @property(readonly, nonatomic) NSProgressIndicator* progressIndicator; 32 @property(readonly, nonatomic) NSProgressIndicator* progressIndicator;
32 33
33 // Designated initializer. |tileSize| is the size of tiles in the grid. 34 // Designated initializer. |tileSize| is the size of tiles in the grid.
34 - (id)initWithSize:(NSSize)tileSize; 35 - (id)initWithSize:(NSSize)tileSize;
(...skipping 11 matching lines...) Expand all
46 - (NSMenu*)contextMenu; 47 - (NSMenu*)contextMenu;
47 48
48 // Take a snapshot of the grid cell with correct layout, then hide the button. 49 // Take a snapshot of the grid cell with correct layout, then hide the button.
49 // If |isRestore| is true, the snapshot includes the label and items hidden for 50 // If |isRestore| is true, the snapshot includes the label and items hidden for
50 // the initial snapshot are restored. 51 // the initial snapshot are restored.
51 - (NSBitmapImageRep*)dragRepresentationForRestore:(BOOL)isRestore; 52 - (NSBitmapImageRep*)dragRepresentationForRestore:(BOOL)isRestore;
52 53
53 @end 54 @end
54 55
55 #endif // UI_APP_LIST_COCOA_APPS_GRID_VIEW_ITEM_H_ 56 #endif // UI_APP_LIST_COCOA_APPS_GRID_VIEW_ITEM_H_
OLDNEW
« no previous file with comments | « ui/app_list/cocoa/apps_grid_controller_unittest.mm ('k') | ui/app_list/cocoa/apps_search_box_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698