Fix layout of omnibox rows for material design

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

 // Copyright (c) 2012 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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
 #endif
@@ skipping 704 matching lines @@
 }
 
 void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) {
   Layout();
   SchedulePaint();
 }
 
 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 {
   return std::max(
       default_icon_size_ + GetLayoutInsets(OMNIBOX_DROPDOWN_ICON).height(),
       GetTextHeight() + GetLayoutInsets(OMNIBOX_DROPDOWN_TEXT).height());
 }
 
 scoped_ptr<gfx::RenderText> OmniboxResultView::CreateAnswerLine(
     const SuggestionAnswer::ImageLine& line,
@@ skipping 65 matching lines @@
 
 int OmniboxResultView::StartMargin() const {
   return ui::MaterialDesignController::IsModeMaterial() ?
       model_->start_margin() : 0;
 }
 
 int OmniboxResultView::EndMargin() const {
   return ui::MaterialDesignController::IsModeMaterial() ?
       model_->end_margin() : 0;
 }