chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.mm - Issue 23531053: ui/base/animation -> ui/gfx/animation

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.mm

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge 2 trunk Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.h ('k') | chrome/browser/ui/cocoa/tabs/tab_projecting_image_view_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #import "chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.h"	5 #import "chrome/browser/ui/cocoa/tabs/tab_projecting_image_view.h"

6	6

7 @implementation TabProjectingImageView	7 @implementation TabProjectingImageView

8	8

9 - (id)initWithFrame:(NSRect)rect	9 - (id)initWithFrame:(NSRect)rect

10 backgroundImage:(NSImage*)backgroundImage	10 backgroundImage:(NSImage*)backgroundImage

11 projectorImage:(NSImage*)projectorImage	11 projectorImage:(NSImage*)projectorImage

12 throbImage:(NSImage*)throbImage	12 throbImage:(NSImage*)throbImage

13 durationMS:(int)durationMS	13 durationMS:(int)durationMS

14 animationContainer:(ui::AnimationContainer*)animationContainer {	14 animationContainer:(gfx::AnimationContainer*)animationContainer {

15 if ((self = [super initWithFrame:rect	15 if ((self = [super initWithFrame:rect

16 backgroundImage:backgroundImage	16 backgroundImage:backgroundImage

17 throbImage:throbImage	17 throbImage:throbImage

18 durationMS:durationMS	18 durationMS:durationMS

19 throbPosition:kThrobPositionOverlay	19 throbPosition:kThrobPositionOverlay

20 animationContainer:animationContainer])) {	20 animationContainer:animationContainer])) {

21 projectorImage_.reset([projectorImage retain]);	21 projectorImage_.reset([projectorImage retain]);

22 }	22 }

23 return self;	23 return self;

24 }	24 }

(...skipping 28 matching lines...) Expand all Loading...
53 operation:NSCompositeSourceOver	53 operation:NSCompositeSourceOver

54 fraction:1];	54 fraction:1];

55	55

56 [throbImage_ drawInRect:[self bounds]	56 [throbImage_ drawInRect:[self bounds]

57 fromRect:NSZeroRect	57 fromRect:NSZeroRect

58 operation:NSCompositeSourceOver	58 operation:NSCompositeSourceOver

59 fraction:throbAnimation_->GetCurrentValue()];	59 fraction:throbAnimation_->GetCurrentValue()];

60 }	60 }

61	61

62 @end	62 @end

OLD	NEW