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

Index: chrome/browser/ui/cocoa/tabs/throbber_view.mm

diff --git a/chrome/browser/ui/cocoa/tabs/throbber_view.mm b/chrome/browser/ui/cocoa/tabs/throbber_view.mm

index 29cc6df2f3bed1d762d10c951a00ea75375e3ad2..6abc29a9962bbffef53bf6a25af7b7a4b7635c12 100644

--- a/chrome/browser/ui/cocoa/tabs/throbber_view.mm

+++ b/chrome/browser/ui/cocoa/tabs/throbber_view.mm

@@ -29,7 +29,7 @@ static const float kAnimationIntervalSeconds = 0.03; // 30ms, same as windows

@interface ThrobberFilmstripDelegate : NSObject

<ThrobberDataDelegate> {

- scoped_nsobject<NSImage> image_;

+ base::scoped_nsobject<NSImage> image_;

unsigned int numFrames_; // Number of frames in this animation.

unsigned int animationFrame_; // Current frame of the animation,

// [0..numFrames_)

@@ -83,8 +83,8 @@ static const float kAnimationIntervalSeconds = 0.03; // 30ms, same as windows

@interface ThrobberToastDelegate : NSObject

<ThrobberDataDelegate> {

- scoped_nsobject<NSImage> image1_;

- scoped_nsobject<NSImage> image2_;

+ base::scoped_nsobject<NSImage> image1_;

+ base::scoped_nsobject<NSImage> image2_;

NSSize image1Size_;

NSSize image2Size_;

int animationFrame_; // Current frame of the animation,