chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.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/extensions/browser_action_button_interactive_uitest.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/download/download_started_animation_mac.mm ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm

diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm

index 6e59f9a28409622b852e91af17a2ecfbe1049000..03717c00ed8d6fe7955614b94102cf7880db1147 100644

--- a/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm

+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm

@@ -30,6 +30,7 @@

#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"

#include "chrome/test/base/interactive_test_utils.h"

#include "extensions/common/feature_switch.h"

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

#import "ui/events/test/cocoa_test_event_utils.h"

namespace {

@@ -75,7 +76,7 @@ NSPoint GetCenterPoint(NSView* view) {

NSRect bounds = [view bounds];

NSPoint center = NSMakePoint(NSMidX(bounds), NSMidY(bounds));

center = [view convertPoint:center toView:nil];

- center = [window convertBaseToScreen:center];

+ center = ui::ConvertPointFromWindowToScreen(window, center);

return NSMakePoint(center.x, [screen frame].size.height - center.y);

}