chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h - Issue 17593006: mac: Update clients of scoped_nsobject.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanups 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

« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm ('K') | « chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h » ('j') | chrome/common/mac/objc_method_swizzle.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h

diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h b/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h

index 0c3c19b0faebf8e470328a992bbb9741ac9d5a74..ada3f6a9f3345919cb0cd5bffd3ea84e9eb53987 100644

--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h

+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_info.h

@@ -7,7 +7,7 @@

#import <Cocoa/Cocoa.h>

-#include "base/memory/scoped_nsobject.h"

+#include "base/mac/scoped_nsobject.h"

@protocol ConstrainedWindowSheet;

@@ -17,8 +17,8 @@

@interface ConstrainedWindowSheetInfo : NSObject {

@private

scoped_nsprotocol<id<ConstrainedWindowSheet>> sheet_;

- scoped_nsobject<NSView> parentView_;

- scoped_nsobject<NSWindow> overlayWindow_;

+ base::scoped_nsobject<NSView> parentView_;

+ base::scoped_nsobject<NSWindow> overlayWindow_;

BOOL sheetDidShow_;

}