Omnibox UI Experiments: Port Vertical Layout experiment to Mac Cocoa.

chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.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_matrix.h"
 
+#include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "components/omnibox/browser/autocomplete_result.h"
+#include "components/omnibox/browser/omnibox_field_trial.h"
 
 namespace {
 
 // NSEvent -buttonNumber for middle mouse button.
 const NSInteger kMiddleButtonNumber = 2;
 
 }  // namespace
 
 @interface OmniboxPopupMatrix ()
 - (OmniboxPopupTableController*)controller;
@@ skipping 76 matching lines @@
 
 - (NSInteger)highlightedRow {
   return hoveredIndex_;
 }
 
 - (void)setHighlightedRow:(NSInteger)rowIndex {
   hoveredIndex_ = rowIndex;
 }
 
 - (CGFloat)tableView:(NSTableView*)tableView heightOfRow:(NSInteger)row {
-  CGFloat height = [OmniboxPopupCell getContentTextHeight];
-  if ([[array_ objectAtIndex:row] isAnswer]) {
+  bool isAnswer = [[array_ objectAtIndex:row] isAnswer];

[groby-ooo-7-16, 2017/05/31 00:14:51]

BOOL, please :)

[tommycli, 2017/05/31 18:20:40]

Done.

+  bool isTwoLine = !isAnswer && base::FeatureList::IsEnabled(

[groby-ooo-7-16, 2017/05/31 00:14:51]

isDoubleLine or usesTwoLines, please. (isTwoLine seems like it's missing a word)

[tommycli, 2017/05/31 18:20:40]

Done.

+                                    omnibox::kUIExperimentVerticalLayout);
+  CGFloat height = [OmniboxPopupCell getContentTextHeight:isTwoLine];
+
+  if (isAnswer) {
     OmniboxPopupMatrix* matrix =
         base::mac::ObjCCastStrict<OmniboxPopupMatrix>(tableView);
     NSRect rowRect = [tableView rectOfColumn:0];
     OmniboxPopupCellData* cellData =
         base::mac::ObjCCastStrict<OmniboxPopupCellData>(
             [array_ objectAtIndex:row]);
     // Subtract any Material Design padding and/or icon.
     rowRect.size.width = [OmniboxPopupCell getContentAreaWidth:rowRect] -
                          [matrix contentLeftPadding];
     NSAttributedString* text = [cellData description];
@@ skipping 193 matching lines @@
   [self selectRowIndex:row];
   if (row != -1) {
     DCHECK(observer_);
     observer_->OnMatrixRowSelected(self, row);
     return YES;
   }
   return NO;
 }
 
 @end