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

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

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

index bb689e5d4f5d82c47e4a17dac17b922fa5641bf4..6eea93677469813272e9aef36cacb8949859f8bf 100644

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

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

@@ -15,6 +15,7 @@

#import "chrome/browser/ui/cocoa/view_id_util.h"

#include "components/bookmarks/browser/bookmark_model.h"

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

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

#import "ui/base/cocoa/nsview_additions.h"

#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"

@@ -109,7 +110,7 @@ BookmarkButton* gDraggedButton = nil; // Weak

NSRect bounds = [self bounds];

point = NSMakePoint(NSMidX(bounds), NSMidY(bounds));

point = [self convertPoint:point toView:nil];

- point = [[self window] convertBaseToScreen:point];

+ point = ui::ConvertPointFromWindowToScreen([self window], point);

}

return point;