chrome/browser/ui/cocoa/download/download_started_animation_mac.mm - Issue 1775223002: Prepare chrome/ for compilation with OS X 10.7 deployment target.

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/download/download_started_animation_mac.mm

Issue 1775223002: Prepare chrome/ for compilation with OS X 10.7 deployment target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Compile errors. Fix null-window error. Created 4 years, 9 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

« no previous file with comments | « chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/download/download_started_animation_mac.mm

diff --git a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm

index f47725514c0e837c17c9b5fb10022f635fd5bc2d..ef999734a3c104a37cf695051d872c2737ef9c3d 100644

--- a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm

+++ b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm

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

#include "grit/theme_resources.h"

#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"

#include "third_party/skia/include/utils/mac/SkCGUtils.h"

+#include "ui/base/cocoa/cocoa_base_utils.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/geometry/rect.h"

#include "ui/gfx/image/image.h"

@@ -68,7 +69,7 @@ class DownloadAnimationWebObserver;

NSPoint origin = [tabContentsView frame].origin;

origin = [tabContentsView convertPoint:origin toView:nil];

- origin = [parentWindow convertBaseToScreen:origin];

+ origin = ui::ConvertPointFromWindowToScreen(parentWindow, origin);

// Create the animation object to assist in animating and fading.

CGFloat animationHeight = MIN(bounds.height(), 4 * imageHeight);