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

Side by Side Diff: chrome/browser/ui/cocoa/download/download_shelf_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 (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 "base/memory/scoped_nsobject.h" 7 #include "base/mac/scoped_nsobject.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #import "chrome/browser/ui/cocoa/view_resizer.h"
9 #include "ui/base/cocoa/tracking_area.h" 10 #include "ui/base/cocoa/tracking_area.h"
10 #import "chrome/browser/ui/cocoa/view_resizer.h"
11 11
12 @class AnimatableView; 12 @class AnimatableView;
13 class Browser; 13 class Browser;
14 @class BrowserWindowController; 14 @class BrowserWindowController;
15 @class DownloadItemController; 15 @class DownloadItemController;
16 class DownloadShelf; 16 class DownloadShelf;
17 @class DownloadShelfView; 17 @class DownloadShelfView;
18 @class HyperlinkButtonCell; 18 @class HyperlinkButtonCell;
19 @class HoverButton; 19 @class HoverButton;
20 20
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 CGFloat maxShelfHeight_; 64 CGFloat maxShelfHeight_;
65 65
66 // Current height of the shelf. Changes while the shelf is animating in or 66 // Current height of the shelf. Changes while the shelf is animating in or
67 // out. 67 // out.
68 CGFloat currentShelfHeight_; 68 CGFloat currentShelfHeight_;
69 69
70 // Used to autoclose the shelf when the mouse is moved off it. 70 // Used to autoclose the shelf when the mouse is moved off it.
71 ui::ScopedCrTrackingArea trackingArea_; 71 ui::ScopedCrTrackingArea trackingArea_;
72 72
73 // The download items we have added to our shelf. 73 // The download items we have added to our shelf.
74 scoped_nsobject<NSMutableArray> downloadItemControllers_; 74 base::scoped_nsobject<NSMutableArray> downloadItemControllers_;
75 75
76 // The container that contains (and clamps) all the download items. 76 // The container that contains (and clamps) all the download items.
77 IBOutlet NSView* itemContainerView_; 77 IBOutlet NSView* itemContainerView_;
78 78
79 // Delegate that handles resizing our view. 79 // Delegate that handles resizing our view.
80 id<ViewResizer> resizeDelegate_; 80 id<ViewResizer> resizeDelegate_;
81 81
82 // Used for loading pages. 82 // Used for loading pages.
83 content::PageNavigator* navigator_; 83 content::PageNavigator* navigator_;
84 }; 84 };
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 // release the downloads. 124 // release the downloads.
125 - (void)exiting; 125 - (void)exiting;
126 126
127 // Return the height of the download shelf. 127 // Return the height of the download shelf.
128 - (float)height; 128 - (float)height;
129 129
130 // Re-layouts all download items based on their current state. 130 // Re-layouts all download items based on their current state.
131 - (void)layoutItems; 131 - (void)layoutItems;
132 132
133 @end 133 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698