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

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

Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm
index 2350df54329117ae2baf09d32870eab5e5a1ccc0..7e9552056cbbf43cb709022522c0fc80dd65ad88 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm
@@ -564,11 +564,11 @@ NSAttributedString* CreateClassifiedAttributedString(
         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]
@@ -636,6 +636,7 @@ NSAttributedString* CreateClassifiedAttributedString(
       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 |