Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(638)

Unified Diff: chrome/browser/ui/cocoa/app_menu/menu_tracked_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 | « no previous file | chrome/browser/ui/cocoa/autofill/autofill_details_container.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/app_menu/menu_tracked_button.mm
diff --git a/chrome/browser/ui/cocoa/app_menu/menu_tracked_button.mm b/chrome/browser/ui/cocoa/app_menu/menu_tracked_button.mm
index 40dfcb45283c8ef690516698050e0278d85ed6a3..0570c66d404ca057020a4fb77334669050ead3c4 100644
--- a/chrome/browser/ui/cocoa/app_menu/menu_tracked_button.mm
+++ b/chrome/browser/ui/cocoa/app_menu/menu_tracked_button.mm
@@ -4,6 +4,8 @@
#import "chrome/browser/ui/cocoa/app_menu/menu_tracked_button.h"
+#include "ui/base/cocoa/cocoa_base_utils.h"
+
@interface MenuTrackedButton (Private)
- (void)doHighlight:(BOOL)highlight;
- (void)checkMouseInRect;
@@ -84,7 +86,7 @@
// exit mouse events and thus polling is necessary.
- (void)checkMouseInRect {
NSPoint point = [NSEvent mouseLocation];
- point = [[self window] convertScreenToBase:point];
+ point = ui::ConvertPointFromScreenToWindow([self window], point);
point = [self convertPoint:point fromView:nil];
if (!NSPointInRect(point, [self insetBounds])) {
[self doHighlight:NO];
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/autofill/autofill_details_container.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698