Merge 54767 - [Mac] M6 Omnibox positioning changes....

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

 // Copyright (c) 2010 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 <cmath>
+
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/stl_util-inl.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/cocoa/event_utils.h"
 #include "chrome/browser/cocoa/image_utils.h"
 #include "gfx/rect.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 
 namespace {
 
 // 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 = 7.0;
+const int kCellHeightAdjust = 6.0;
 
 // How to round off the popup's corners.  Goal is to match star and go
 // buttons.
 const CGFloat kPopupRoundingRadius = 3.5;
 
 // Gap between the field and the popup.
 const CGFloat kPopupFieldGap = 2.0;
 
 // How opaque the popup window should be.  This matches Windows (see
 // autocomplete_popup_contents_view.cc, kGlassPopupTransparency).
 const CGFloat kPopupAlpha = 240.0 / 255.0;
 
 // How far to offset image column from the left.
 const CGFloat kImageXOffset = 4.0;
 
 // How far to offset the text column from the left.
-const CGFloat kTextXOffset = 26.0;
+const CGFloat kTextXOffset = 27.0;
 
 // Animation duration when animating the popup window smaller.
 const NSTimeInterval kShrinkAnimationDuration = 0.1;
 
 // Maximum fraction of the popup width that can be used to display match
 // contents.
 const float kMaxContentsFraction = 0.7;
 
 // NSEvent -buttonNumber for middle mouse button.
 const static NSInteger kMiddleButtonNumber(2);
 
 // The autocomplete field's visual border is slightly inset from the
 // actual border so that it can spill a glow into the toolbar or
 // something like that.  This is how much to inset vertically.
 const CGFloat kFieldVisualInset = 1.0;
 
 // The popup window has a single-pixel border in screen coordinates,
 // which has to be backed out to line the borders up with the field
 // borders.
 const CGFloat kWindowBorderWidth = 1.0;
 
-// |AutocompleteButtonCell| and |AutocompleteTextFieldCell| draw their
-// text somewhat differently.  The image needs to be adjusted slightly
-// downward to align with the text the same.
-const CGFloat kImageBaselineAdjust = 1.0;
-
 // Background colors for different states of the popup elements.
 NSColor* BackgroundColor() {
   return [[NSColor controlBackgroundColor] colorWithAlphaComponent:kPopupAlpha];
 }
 NSColor* SelectedBackgroundColor() {
   return [[NSColor selectedControlColor] colorWithAlphaComponent:kPopupAlpha];
 }
 NSColor* HoveredBackgroundColor() {
   return [[NSColor controlHighlightColor] colorWithAlphaComponent:kPopupAlpha];
 }
@@ skipping 429 matching lines @@
 // with the star button and autocomplete field.
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
   [[self backgroundColor] set];
   NSRectFill(cellFrame);
 
   // Put the image centered vertically but in a fixed column.
   NSImage* image = [self image];
   if (image) {
     NSRect imageRect = cellFrame;
     imageRect.size = [image size];
-    imageRect.origin.y += kImageBaselineAdjust +
-        floor((NSHeight(cellFrame) - NSHeight(imageRect)) / 2);
+    imageRect.origin.y +=
+        std::floor((NSHeight(cellFrame) - NSHeight(imageRect)) / 2.0);
     imageRect.origin.x += kImageXOffset;
     [image drawInRect:imageRect
              fromRect:NSZeroRect  // Entire image
             operation:NSCompositeSourceOver
              fraction:1.0
          neverFlipped:YES];
   }
 
   // Adjust the title position to be lined up under the field's text.
   NSAttributedString* title = [self attributedTitle];
@@ skipping 197 matching lines @@
                                      yRadius:kPopupRoundingRadius];
 
   // Draw the matrix clipped to our border.
   [NSGraphicsContext saveGraphicsState];
   [path addClip];
   [super drawRect:rect];
   [NSGraphicsContext restoreGraphicsState];
 }
 
 @end