chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.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_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

« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm ('k') | chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3223ac29aff4dc3413abc13cc125810b679cf6ab..329594e509b8d2575c4bd30277a2c10aac11c3ff 100644

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

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

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

#import <Cocoa/Cocoa.h>

#include <vector>

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

#include "base/memory/scoped_vector.h"

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

@protocol ConstrainedWindowSheet;

@@ -18,9 +18,9 @@

// A tab in this case is the |parentView| passed to |-showSheet:forParentView:|.

@interface ConstrainedWindowSheetController : NSObject {

@private

- scoped_nsobject<NSMutableArray> sheets_;

- scoped_nsobject<NSWindow> parentWindow_;

- scoped_nsobject<NSView> activeView_;

+ base::scoped_nsobject<NSMutableArray> sheets_;

+ base::scoped_nsobject<NSWindow> parentWindow_;

+ base::scoped_nsobject<NSView> activeView_;

}

// Returns a sheet controller for |parentWindow|. If a sheet controller does not