chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.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/bookmarks/bookmark_bubble_controller.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/bookmarks/bookmark_bar_folder_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm

index f78e17a2cb969218be13c7a743c2c670e756e942..53df21e427fa8f3e548b2f064dc2eb279d24b229 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm

@@ -24,6 +24,7 @@

#include "content/public/browser/notification_registrar.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/user_metrics.h"

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

#include "ui/base/l10n/l10n_util_mac.h"

using base::UserMetricsAction;

@@ -144,7 +145,7 @@ using bookmarks::BookmarkNode;

// which will occur for some unit tests.

NSPoint arrowTip = bwc ? [bwc bookmarkBubblePoint] :

NSMakePoint([window frame].size.width, [window frame].size.height);

- arrowTip = [parentWindow convertBaseToScreen:arrowTip];

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

NSPoint bubbleArrowTip = [bubble arrowTip];

bubbleArrowTip = [bubble convertPoint:bubbleArrowTip toView:nil];

arrowTip.y -= bubbleArrowTip.y;