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

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_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 side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698