mac: Fix omnibox size after r156836

chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
 
 #include <cmath>
 
 #include "base/stl_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
-
-#if !defined(MAC_OS_X_VERSION_10_7) || \
-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
-@interface NSWindow (LionAPI)
-- (CGFloat)backingScaleFactor;
-@end
-#endif  // 10.7
-
-
 // The size delta between the font used for the edit and the result
 // rows.
 const int kEditFontAdjust = -1;
 
 // How much to adjust the cell sizing up from the default determined
 // by the font.
 const int kCellHeightAdjust = 6.0;
 
 // How to round off the popup's corners.  Goal is to match star and go
 // buttons.
@@ skipping 48 matching lines @@
 NSColor* ContentTextColor() {
   return [NSColor blackColor];
 }
 NSColor* DimContentTextColor() {
   return [NSColor darkGrayColor];
 }
 NSColor* URLTextColor() {
   return [NSColor colorWithCalibratedRed:0.0 green:0.55 blue:0.0 alpha:1.0];
 }
 
-CGFloat ScaleFactor(NSWindow* window) {
-  if ([window respondsToSelector:@selector(backingScaleFactor)])
-    return [window backingScaleFactor];
-  return [window userSpaceScaleFactor];
-}
-
 }  // namespace
 
 // Helper for MatchText() to allow sharing code between the contents
 // and description cases.  Returns NSMutableAttributedString as a
 // convenience for MatchText().
 NSMutableAttributedString* OmniboxPopupViewMac::DecorateMatchedString(
     const string16 &matchString,
     const AutocompleteMatch::ACMatchClassifications &classifications,
     NSColor* textColor, NSColor* dimTextColor, gfx::Font& font) {
   // Cache for on-demand computation of the bold version of |font|.
@@ skipping 232 matching lines @@
   // Calculate the popup's position on the screen.  It should abut the
   // field's visual border vertically, and be below the bounds
   // horizontally.
 
   // Start with the field's rect on the screen.
   NSRect popupFrame = NSInsetRect([field_ bounds], 0.0, kFieldVisualInset);
   popupFrame = [field_ convertRect:popupFrame toView:nil];
   popupFrame.origin = [[field_ window] convertBaseToScreen:popupFrame.origin];
 
   // Size to fit the matrix, and shift down by the size plus the top
-  // window border.  Would prefer -convertSize:fromView: to
-  // -userSpaceScaleFactor for the scale conversion, but until the
-  // window is on-screen that doesn't work right (bug?).
-  popupFrame.size.height = matrixHeight * ScaleFactor(popup_);
+  // window border.
+  popupFrame.size.height = matrixHeight;
   popupFrame.origin.y -= NSHeight(popupFrame) + kWindowBorderWidth;
 
   // Inset to account for the horizontal border drawn by the window.
   popupFrame = NSInsetRect(popupFrame, kWindowBorderWidth, 0.0);
 
   // Leave a gap between the popup and the field.
-  popupFrame.origin.y -= kPopupFieldGap * ScaleFactor(popup_);
+  popupFrame.origin.y -= kPopupFieldGap;
 
   // Do nothing if the popup is already animating to the given |frame|.
   if (NSEqualRects(popupFrame, targetPopupFrame_))
     return;
 
   NSRect currentPopupFrame = [popup_ frame];
   targetPopupFrame_ = popupFrame;
 
   // Animate the frame change if the only change is that the height got smaller.
   // Otherwise, resize immediately.
@@ skipping 66 matching lines @@
 
   // The popup's font is a slightly smaller version of the field's.
   NSFont* fieldFont = OmniboxViewMac::GetFieldFont();
   const CGFloat resultFontSize = [fieldFont pointSize] + kEditFontAdjust;
   gfx::Font resultFont(base::SysNSStringToUTF8([fieldFont fontName]),
                        static_cast<int>(resultFontSize));
 
   AutocompleteMatrix* matrix = [popup_ contentView];
 
   // Calculate the width of the matrix based on backing out the
-  // popup's border from the width of the field.  Would prefer to use
-  // [matrix convertSize:fromView:] for converting from screen size,
-  // but that doesn't work until the popup is on-screen (bug?).
+  // popup's border from the width of the field.
   const NSRect fieldRectBase = [field_ convertRect:[field_ bounds] toView:nil];
   const CGFloat popupWidth = NSWidth(fieldRectBase) - 2 * kWindowBorderWidth;
   DCHECK_GT(popupWidth, 0.0);
-  const CGFloat matrixWidth = popupWidth / ScaleFactor(popup_);
+  const CGFloat matrixWidth = popupWidth;
 
   // Load the results into the popup's matrix.
   const size_t rows = model_->result().size();
   DCHECK_GT(rows, 0U);
   [matrix renewRows:rows columns:1];
   for (size_t ii = 0; ii < rows; ++ii) {
     AutocompleteButtonCell* cell = [matrix cellAtRow:ii column:0];
     const AutocompleteMatch& match = model_->result().match_at(ii);
     [cell setImage:ImageForMatch(match)];
     [cell setAttributedTitle:MatchText(match, resultFont, matrixWidth)];
@@ skipping 301 matching lines @@
                                      xRadius:kPopupRoundingRadius
                                      yRadius:kPopupRoundingRadius];
 
   // Draw the matrix clipped to our border.
   gfx::ScopedNSGraphicsContextSaveGState scopedGState;
   [path addClip];
   [super drawRect:rect];
 }
 
 @end