Omnibox UI: Confine Cocoa suggestion lines to a single-line.

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

 // Copyright 2013 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.
 
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 546 matching lines @@
 
         // Have to nudge the baseline down 1pt in Material Design for the text
         // that follows, so that it's the same as the bottom of the image.
         origin.y += 1;
       }
     } else {
       if (isVerticalLayout) {
         origin.x = left;
         origin.y += halfLineHeight * 2;
       } else {
-        origin.x += [self drawMatchPart:[tableView separator]
-                              withFrame:cellFrame
-                                 origin:origin
-                           withMaxWidth:separatorWidth
-                           forDarkTheme:isDarkTheme];
+        [self drawMatchPart:[tableView separator]
+                  withFrame:cellFrame
+                     origin:origin
+               withMaxWidth:separatorWidth
+               forDarkTheme:isDarkTheme];

[tommycli, 2017/06/02 23:35:07]

not strictly speaking related, but just fixing up something i noticed.

[tommycli, 2017/06/02 23:42:43]

Err nevermind, I realized it was correct the way it was before.

       }
     }
     [self drawMatchPart:[cellData description]
               withFrame:cellFrame
                  origin:origin
            withMaxWidth:descriptionMaxWidth
            forDarkTheme:isDarkTheme];
   }
 }
 
@@ skipping 47 matching lines @@
 
 - (CGFloat)drawMatchPart:(NSAttributedString*)attributedString
                withFrame:(NSRect)cellFrame
                   origin:(NSPoint)origin
             withMaxWidth:(int)maxWidth
             forDarkTheme:(BOOL)isDarkTheme {
   NSRect renderRect = NSIntersectionRect(
       cellFrame, NSOffsetRect(cellFrame, origin.x, origin.y));
   renderRect.size.width =
       std::min(NSWidth(renderRect), static_cast<CGFloat>(maxWidth));
+  renderRect.size.height = std::min(NSWidth(renderRect), kDefaultTextHeight);
   if (!NSIsEmptyRect(renderRect)) {
     [attributedString drawWithRect:FlipIfRTL(renderRect, cellFrame)
                            options:NSStringDrawingUsesLineFragmentOrigin |
                                    NSStringDrawingTruncatesLastVisibleLine];
   }
   return NSWidth(renderRect);
 }
 
 + (CGFloat)computeContentsOffset:(const AutocompleteMatch&)match {
   const base::string16& inputText = base::UTF8ToUTF16(
@@ skipping 74 matching lines @@
 }
 
 + (CGFloat)getContentTextHeightForDoubleLine:(BOOL)isDoubleLine {
   CGFloat height = kDefaultTextHeight + 2 * GetVerticalMargin();
   if (isDoubleLine)
     height += kDefaultTextHeight + kDefaultVerticalMargin;
   return height;
 }
 
 @end