Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.h |
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h |
index dc5e357d7d8898c1e66ea23854bef80f24870e4a..216ff3bb101dfb8d26320f07f18cae8dfd34a9d5 100644 |
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h |
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.h |
@@ -7,7 +7,7 @@ |
#import <Cocoa/Cocoa.h> |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "base/memory/scoped_ptr.h" |
#import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h" |
#import "chrome/browser/ui/cocoa/url_drop_target.h" |
@@ -61,16 +61,17 @@ class AnimationContainer; |
NSObject<TabControllerTarget, |
URLDropTargetController> { |
@private |
- scoped_nsobject<TabStripView> tabStripView_; |
+ base::scoped_nsobject<TabStripView> tabStripView_; |
NSView* switchView_; // weak |
- scoped_nsobject<NSView> dragBlockingView_; // avoid bad window server drags |
+ base::scoped_nsobject<NSView> dragBlockingView_; // avoid bad window server |
+ // drags |
NewTabButton* newTabButton_; // weak, obtained from the nib. |
// The controller that manages all the interactions of dragging tabs. |
- scoped_nsobject<TabStripDragController> dragController_; |
+ base::scoped_nsobject<TabStripDragController> dragController_; |
// Tracks the newTabButton_ for rollovers. |
- scoped_nsobject<CrTrackingArea> newTabTrackingArea_; |
+ base::scoped_nsobject<CrTrackingArea> newTabTrackingArea_; |
scoped_ptr<TabStripModelObserverBridge> bridge_; |
Browser* browser_; // weak |
TabStripModel* tabStripModel_; // weak |
@@ -89,14 +90,14 @@ class AnimationContainer; |
// tabs are animating closed (closed tabs are removed from |tabStripModel_| |
// immediately, but from |tabContentsArray_| only after their close animation |
// has completed). |
- scoped_nsobject<NSMutableArray> tabContentsArray_; |
+ base::scoped_nsobject<NSMutableArray> tabContentsArray_; |
// An array of TabControllers which manage the actual tab views. See note |
// above |tabContentsArray_|. |tabContentsArray_| and |tabArray_| always |
// contain objects belonging to the same tabs at the same indices. |
- scoped_nsobject<NSMutableArray> tabArray_; |
+ base::scoped_nsobject<NSMutableArray> tabArray_; |
// Set of TabControllers that are currently animating closed. |
- scoped_nsobject<NSMutableSet> closingControllers_; |
+ base::scoped_nsobject<NSMutableSet> closingControllers_; |
// These values are only used during a drag, and override tab positioning. |
TabView* placeholderTab_; // weak. Tab being dragged |
@@ -105,7 +106,7 @@ class AnimationContainer; |
// Frame targets for all the current views. |
// target frames are used because repeated requests to [NSView animator]. |
// aren't coalesced, so we store frames to avoid redundant calls. |
- scoped_nsobject<NSMutableDictionary> targetFrames_; |
+ base::scoped_nsobject<NSMutableDictionary> targetFrames_; |
NSRect newTabTargetFrame_; |
// If YES, do not show the new tab button during layout. |
BOOL forceNewTabButtonHidden_; |
@@ -121,15 +122,15 @@ class AnimationContainer; |
float availableResizeWidth_; |
// A tracking area that's the size of the tab strip used to be notified |
// when the mouse moves in the tab strip |
- scoped_nsobject<CrTrackingArea> trackingArea_; |
+ base::scoped_nsobject<CrTrackingArea> trackingArea_; |
TabView* hoveredTab_; // weak. Tab that the mouse is hovering over |
// Array of subviews which are permanent (and which should never be removed), |
// such as the new-tab button, but *not* the tabs themselves. |
- scoped_nsobject<NSMutableArray> permanentSubviews_; |
+ base::scoped_nsobject<NSMutableArray> permanentSubviews_; |
// The default favicon, so we can use one copy for all buttons. |
- scoped_nsobject<NSImage> defaultFavicon_; |
+ base::scoped_nsobject<NSImage> defaultFavicon_; |
// The amount by which to indent the tabs on the sides (to make room for the |
// red/yellow/green and incognito/fullscreen buttons). |