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

Unified Diff: chrome/browser/ui/cocoa/tabs/tab_window_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_window_controller.h
diff --git a/chrome/browser/ui/cocoa/tabs/tab_window_controller.h b/chrome/browser/ui/cocoa/tabs/tab_window_controller.h
index 4242c2d3f155ebbd18473d3519d983916b64832f..70693ffe9ea961a97e3a52f14e21b6b80a06df35 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_window_controller.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_window_controller.h
@@ -14,7 +14,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
@class FastResizeView;
@class FocusTracker;
@@ -23,8 +23,8 @@
@interface TabWindowController : NSWindowController<NSWindowDelegate> {
@private
- scoped_nsobject<FastResizeView> tabContentArea_;
- scoped_nsobject<TabStripView> tabStripView_;
+ base::scoped_nsobject<FastResizeView> tabContentArea_;
+ base::scoped_nsobject<TabStripView> tabStripView_;
// The child window used during dragging to achieve the opacity tricks.
NSWindow* overlayWindow_;
@@ -33,7 +33,7 @@
// of the drag) to the |overlayWindow_|.
NSView* originalContentView_; // weak
- scoped_nsobject<FocusTracker> focusBeforeOverlay_;
+ base::scoped_nsobject<FocusTracker> focusBeforeOverlay_;
BOOL closeDeferred_; // If YES, call performClose: in removeOverlay:.
}
@property(readonly, nonatomic) TabStripView* tabStripView;

Powered by Google App Engine
This is Rietveld 408576698