Fix layout of omnibox rows for material design

chrome/browser/ui/views/omnibox/omnibox_result_view.cc

Index: chrome/browser/ui/views/omnibox/omnibox_result_view.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
index 9a640a68870fe6839295d5fb33e32bd69f3674c5..877fa8cdd3f0e1d2122bf6d79037165df08020b6 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
@@ -722,9 +722,16 @@ void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) {
 int OmniboxResultView::GetAnswerLineHeight() const {
   // GetTextStyle(1) is the largest font used and so defines the boundary that
   // all the other answer styles fit within.
-  return ui::ResourceBundle::GetSharedInstance()
+  int font_height =
+      ui::ResourceBundle::GetSharedInstance()
       .GetFontList(GetTextStyle(1).font)
       .GetHeight();
+  if (!ui::MaterialDesignController::IsModeMaterial())
+    return font_height;
+
+  // Answer lines should be at least as tall as content lines in
+  // material design.
+  return std::max(font_height, GetContentLineHeight());

[Peter Kasting, 2015/10/13 19:21:17]

Where in the specs is this requirement?  I don't understand why this is
desirable, it seems like a loss to me.

 }
 
 int OmniboxResultView::GetContentLineHeight() const {