chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.mm - 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_custom_sheet.mm

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_custom_sheet.h ('k') | chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.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_custom_sheet.mm

diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.mm

index 28668aac092df32628b8ef86d82ec2eed3e0b42c..ab3d83eac02d6c8c16a508871a340531b5cfe5e6 100644

--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.mm

+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.mm

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

}

- (void)showSheetForWindow:(NSWindow*)window {

- scoped_nsobject<NSAnimation> animation(

+ base::scoped_nsobject<NSAnimation> animation(

[[ConstrainedWindowAnimationShow alloc] initWithWindow:customWindow_]);

[window addChildWindow:customWindow_

ordered:NSWindowAbove];

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

- (void)closeSheetWithAnimation:(BOOL)withAnimation {

if (withAnimation) {

- scoped_nsobject<NSAnimation> animation(

+ base::scoped_nsobject<NSAnimation> animation(

[[ConstrainedWindowAnimationHide alloc] initWithWindow:customWindow_]);

[animation startAnimation];

}

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

}

- (void)pulseSheet {

- scoped_nsobject<NSAnimation> animation(

+ base::scoped_nsobject<NSAnimation> animation(

[[ConstrainedWindowAnimationPulse alloc] initWithWindow:customWindow_]);

[animation startAnimation];

}