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

Side by Side Diff: chrome/browser/ui/cocoa/tabpose_window.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CHROME_BROWSER_UI_COCOA_TABPOSE_WINDOW_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_TABPOSE_WINDOW_H_
6 #define CHROME_BROWSER_UI_COCOA_TABPOSE_WINDOW_H_ 6 #define CHROME_BROWSER_UI_COCOA_TABPOSE_WINDOW_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/mac/scoped_cftyperef.h" 10 #include "base/mac/scoped_cftyperef.h"
11 11
12 #include "base/memory/scoped_nsobject.h" 12 #include "base/mac/scoped_nsobject.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/scoped_vector.h" 14 #include "base/memory/scoped_vector.h"
15 15
16 namespace tabpose { 16 namespace tabpose {
17 17
18 class Tile; 18 class Tile;
19 class TileSet; 19 class TileSet;
20 20
21 } 21 }
22 22
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 CALayer* selectionHighlight_; // weak 54 CALayer* selectionHighlight_; // weak
55 55
56 // Colors used by the layers. 56 // Colors used by the layers.
57 base::ScopedCFTypeRef<CGColorRef> gray_; 57 base::ScopedCFTypeRef<CGColorRef> gray_;
58 base::ScopedCFTypeRef<CGColorRef> darkBlue_; 58 base::ScopedCFTypeRef<CGColorRef> darkBlue_;
59 59
60 TabStripModel* tabStripModel_; // weak 60 TabStripModel* tabStripModel_; // weak
61 61
62 // Stores all preview layers. The order in here matches the order in 62 // Stores all preview layers. The order in here matches the order in
63 // the tabstrip model. 63 // the tabstrip model.
64 scoped_nsobject<NSMutableArray> allThumbnailLayers_; 64 base::scoped_nsobject<NSMutableArray> allThumbnailLayers_;
65 65
66 scoped_nsobject<NSMutableArray> allFaviconLayers_; 66 base::scoped_nsobject<NSMutableArray> allFaviconLayers_;
67 scoped_nsobject<NSMutableArray> allTitleLayers_; 67 base::scoped_nsobject<NSMutableArray> allTitleLayers_;
68 68
69 // Manages the state of all layers. 69 // Manages the state of all layers.
70 scoped_ptr<tabpose::TileSet> tileSet_; 70 scoped_ptr<tabpose::TileSet> tileSet_;
71 71
72 // The rectangle of the window that contains all layers. This is the 72 // The rectangle of the window that contains all layers. This is the
73 // rectangle occupied by |bgLayer_|. 73 // rectangle occupied by |bgLayer_|.
74 NSRect containingRect_; 74 NSRect containingRect_;
75 75
76 // Informs us of added/removed/updated tabs. 76 // Informs us of added/removed/updated tabs.
77 scoped_ptr<TabStripModelObserverBridge> tabStripModelObserverBridge_; 77 scoped_ptr<TabStripModelObserverBridge> tabStripModelObserverBridge_;
(...skipping 16 matching lines...) Expand all
94 tabStripModel:(TabStripModel*)tabStripModel; 94 tabStripModel:(TabStripModel*)tabStripModel;
95 @end 95 @end
96 96
97 @interface TabposeWindow (TestingAPI) 97 @interface TabposeWindow (TestingAPI)
98 - (void)selectTileAtIndexWithoutAnimation:(int)newIndex; 98 - (void)selectTileAtIndexWithoutAnimation:(int)newIndex;
99 - (NSUInteger)thumbnailLayerCount; 99 - (NSUInteger)thumbnailLayerCount;
100 - (int)selectedIndex; 100 - (int)selectedIndex;
101 @end 101 @end
102 102
103 #endif // CHROME_BROWSER_UI_COCOA_TABPOSE_WINDOW_H_ 103 #endif // CHROME_BROWSER_UI_COCOA_TABPOSE_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698