Index: chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm |
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm |
index ca66db2cf4d6bc966e97f3621cdcd0225630ed8d..86a132b9df316d9063a153fe288ab4c5e0e2754c 100644 |
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm |
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm |
@@ -4,12 +4,14 @@ |
#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 { |
@@ -106,8 +108,13 @@ const NSInteger kMiddleButtonNumber = 2; |
} |
- (CGFloat)tableView:(NSTableView*)tableView heightOfRow:(NSInteger)row { |
- CGFloat height = [OmniboxPopupCell getContentTextHeight]; |
- if ([[array_ objectAtIndex:row] isAnswer]) { |
+ BOOL isAnswer = [[array_ objectAtIndex:row] isAnswer]; |
+ BOOL isDoubleLine = !isAnswer && base::FeatureList::IsEnabled( |
+ omnibox::kUIExperimentVerticalLayout); |
+ CGFloat height = |
+ [OmniboxPopupCell getContentTextHeightForDoubleLine:isDoubleLine]; |
+ |
+ if (isAnswer) { |
OmniboxPopupMatrix* matrix = |
base::mac::ObjCCastStrict<OmniboxPopupMatrix>(tableView); |
NSRect rowRect = [tableView rectOfColumn:0]; |