chrome/browser/ui/cocoa/animatable_image.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/animatable_image.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:

Index: chrome/browser/ui/cocoa/animatable_image.h

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

index da1f297e5cdc7600a46c8be8c6c0aaf63d391fc9..102f337c596ab69f69cadbdeb61a82d4cdbccfac 100644

--- a/chrome/browser/ui/cocoa/animatable_image.h

+++ b/chrome/browser/ui/cocoa/animatable_image.h

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

#import <Cocoa/Cocoa.h>

#import <QuartzCore/QuartzCore.h>

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

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

// This class helps animate an NSImage's frame and opacity. It works by creating

// a blank NSWindow in the size specified and giving it a layer on which the

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

@interface AnimatableImage : NSWindow {

@private

// The image to animate.

- scoped_nsobject<NSImage> image_;

+ base::scoped_nsobject<NSImage> image_;

// The frame of the image before and after the animation. This is in this

// window's coordinate system.