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

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.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
Index: chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm
diff --git a/chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm b/chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm
index 66ff65cba7a79a8f44de8844467ea767d8d3d906..f5997715f8940ade82f144de9c2385595e09fc8a 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm
@@ -10,6 +10,7 @@
#import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h"
#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
#include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h"
+#include "ui/base/cocoa/cocoa_base_utils.h"
namespace {
@@ -39,9 +40,11 @@ void CheckBubbleAndReferenceView(ToolbarActionsBarBubbleMac* bubble,
CGFloat refLowY = [expectedReferenceView isFlipped] ?
NSMaxY(referenceFrame) : NSMinY(referenceFrame);
NSPoint refLowerLeft = NSMakePoint(NSMinX(referenceFrame), refLowY);
- NSPoint refLowerLeftInScreen = [window convertBaseToScreen:refLowerLeft];
+ NSPoint refLowerLeftInScreen =
+ ui::ConvertPointFromWindowToScreen(window, refLowerLeft);
NSPoint refLowerRight = NSMakePoint(NSMaxX(referenceFrame), refLowY);
- NSPoint refLowerRightInScreen = [window convertBaseToScreen:refLowerRight];
+ NSPoint refLowerRightInScreen =
+ ui::ConvertPointFromWindowToScreen(window, refLowerRight);
// The bubble should be below the reference view, but not too far below.
EXPECT_LE(NSMaxY(bubbleFrame), refLowerLeftInScreen.y);

Powered by Google App Engine
This is Rietveld 408576698