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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

Issue 1486393002: [Merge M48] mac: Fix unit test crash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2564
Patch Set: Created 5 years 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
index e0627c79234b08c8e185f8bad54b76b7cebbfa46..b4249c1dcce4309ea4bbfb0cb92077242916c7f5 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
@@ -284,8 +284,9 @@ void OmniboxPopupViewMac::PositionPopup(const CGFloat matrixHeight) {
// |popup_| gets redrawn once the animation completes. See
// http://crbug.com/538590 and http://crbug.com/551007 .
if (base::mac::IsOSElCapitanOrLater()) {
+ NSWindow* popup = popup_.get();
[[NSAnimationContext currentContext] setCompletionHandler:^{
- [popup_ display];
+ [popup display];
}];
}
[[popup_ animator] setFrame:popup_frame display:YES];
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698