ui/views/controls/menu/menu_runner_impl_cocoa.mm - Issue 1777653002: Prepare ui/ module 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: ui/views/controls/menu/menu_runner_impl_cocoa.mm

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

Patch Set: More compile errors. 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

Index: ui/views/controls/menu/menu_runner_impl_cocoa.mm

diff --git a/ui/views/controls/menu/menu_runner_impl_cocoa.mm b/ui/views/controls/menu/menu_runner_impl_cocoa.mm

index 47547814cf831b6d72bcb29a2e2ea02ad41e63fa..454c951817bbf6cba4efaf8acea43c8038dee911 100644

--- a/ui/views/controls/menu/menu_runner_impl_cocoa.mm

+++ b/ui/views/controls/menu/menu_runner_impl_cocoa.mm

@@ -4,6 +4,7 @@

#import "ui/views/controls/menu/menu_runner_impl_cocoa.h"

+#include "base/mac/sdk_forward_declarations.h"

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

#include "ui/base/models/menu_model.h"

#include "ui/events/event_utils.h"

@@ -41,7 +42,7 @@ base::scoped_nsobject<NSView> CreateMenuAnchorView(

const gfx::Rect& screen_bounds,

NSMenuItem* checked_item) {

NSRect rect = gfx::ScreenRectToNSRect(screen_bounds);

- rect.origin = [window convertScreenToBase:rect.origin];

+ rect = [window convertRectFromScreen:rect];

rect = [[window contentView] convertRect:rect fromView:nil];

// If there's no checked item (e.g. Combobox::STYLE_ACTION), NSMenu will

« no previous file with comments | « ui/views/cocoa/widget_owner_nswindow_adapter.mm ('k') | ui/views/test/event_generator_delegate_mac.mm » ('j') | no next file with comments »