Index: chrome/browser/ui/cocoa/tabs/tab_controller.h |
diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.h b/chrome/browser/ui/cocoa/tabs/tab_controller.h |
index d75d8d6936daaa716ccea30f110a6d998eb2bf7c..93cdbe49e50a2ae20f2bd15b35653fcbf06e8e74 100644 |
--- a/chrome/browser/ui/cocoa/tabs/tab_controller.h |
+++ b/chrome/browser/ui/cocoa/tabs/tab_controller.h |
@@ -40,9 +40,9 @@ class MenuDelegate; |
@interface TabController : NSViewController<TabDraggingEventTarget> { |
@private |
- scoped_nsobject<NSView> iconView_; |
- scoped_nsobject<NSTextField> titleView_; |
- scoped_nsobject<HoverCloseButton> closeButton_; |
+ base::scoped_nsobject<NSView> iconView_; |
+ base::scoped_nsobject<NSTextField> titleView_; |
+ base::scoped_nsobject<HoverCloseButton> closeButton_; |
NSRect originalIconFrame_; // frame of iconView_ as loaded from nib |
BOOL isIconShowing_; // last state of iconView_ in updateVisibility |
@@ -60,7 +60,7 @@ class MenuDelegate; |
SEL action_; // selector sent when tab is selected by clicking |
scoped_ptr<ui::SimpleMenuModel> contextMenuModel_; |
scoped_ptr<TabControllerInternal::MenuDelegate> contextMenuDelegate_; |
- scoped_nsobject<MenuController> contextMenuController_; |
+ base::scoped_nsobject<MenuController> contextMenuController_; |
} |
@property(assign, nonatomic) TabLoadingState loadingState; |