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

Side by Side Diff: chrome/browser/ui/cocoa/download/download_shelf_controller.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include <memory>
8
7 #include "base/mac/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
8 #include "base/memory/scoped_ptr.h"
9 #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h" 10 #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h"
10 #import "chrome/browser/ui/cocoa/view_resizer.h" 11 #import "chrome/browser/ui/cocoa/view_resizer.h"
11 #include "ui/base/cocoa/tracking_area.h" 12 #include "ui/base/cocoa/tracking_area.h"
12 13
13 @class AnimatableView; 14 @class AnimatableView;
14 class Browser; 15 class Browser;
15 @class BrowserWindowController; 16 @class BrowserWindowController;
16 @class DownloadItemController; 17 @class DownloadItemController;
17 class DownloadShelf; 18 class DownloadShelf;
18 @class DownloadShelfView; 19 @class DownloadShelfView;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 54
54 // YES if the containing browser window is fullscreen. 55 // YES if the containing browser window is fullscreen.
55 BOOL isFullscreen_; 56 BOOL isFullscreen_;
56 57
57 // YES if the shelf should be closed when the mouse leaves the shelf. 58 // YES if the shelf should be closed when the mouse leaves the shelf.
58 BOOL shouldCloseOnMouseExit_; 59 BOOL shouldCloseOnMouseExit_;
59 60
60 // YES if the mouse is currently over the download shelf. 61 // YES if the mouse is currently over the download shelf.
61 BOOL isMouseInsideView_; 62 BOOL isMouseInsideView_;
62 63
63 scoped_ptr<DownloadShelf> bridge_; 64 std::unique_ptr<DownloadShelf> bridge_;
64 65
65 // Height of the shelf when it's fully visible. 66 // Height of the shelf when it's fully visible.
66 CGFloat maxShelfHeight_; 67 CGFloat maxShelfHeight_;
67 68
68 // Current height of the shelf. Changes while the shelf is animating in or 69 // Current height of the shelf. Changes while the shelf is animating in or
69 // out. 70 // out.
70 CGFloat currentShelfHeight_; 71 CGFloat currentShelfHeight_;
71 72
72 // Used to autoclose the shelf when the mouse is moved off it. 73 // Used to autoclose the shelf when the mouse is moved off it.
73 ui::ScopedCrTrackingArea trackingArea_; 74 ui::ScopedCrTrackingArea trackingArea_;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // Called by individual item controllers when their downloads are opened. 123 // Called by individual item controllers when their downloads are opened.
123 - (void)downloadWasOpened:(DownloadItemController*)download; 124 - (void)downloadWasOpened:(DownloadItemController*)download;
124 125
125 // Return the height of the download shelf. 126 // Return the height of the download shelf.
126 - (float)height; 127 - (float)height;
127 128
128 // Re-layouts all download items based on their current state. 129 // Re-layouts all download items based on their current state.
129 - (void)layoutItems; 130 - (void)layoutItems;
130 131
131 @end 132 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698