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..44c9a1ff428b8706096e5d7e37f9a50551f0cd5f 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
@@ -359,8 +359,8 @@ void OmniboxResultView::PaintMatch(const AutocompleteMatch& match,
       &contents_max_width,
       &description_max_width);
 
-  int after_contents_x =
-      DrawRenderText(match, contents, true, canvas, x, y, contents_max_width);
+  int after_contents_x = DrawRenderText(match, contents, CONTENTS, canvas,
+                                        x, y, contents_max_width);
 
   if (description_max_width != 0) {
     if (match.answer) {
@@ -376,11 +376,11 @@ void OmniboxResultView::PaintMatch(const AutocompleteMatch& match,
              GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING);
       }
     } else {
-      x = DrawRenderText(match, separator_rendertext_.get(), false, canvas,
+      x = DrawRenderText(match, separator_rendertext_.get(), SEPARATOR, canvas,
                          after_contents_x, y, separator_width_);
     }
 
-    DrawRenderText(match, description, false, canvas, x, y,
+    DrawRenderText(match, description, DESCRIPTION, canvas, x, y,
                    description_max_width);
   }
 }
@@ -388,7 +388,7 @@ void OmniboxResultView::PaintMatch(const AutocompleteMatch& match,
 int OmniboxResultView::DrawRenderText(
     const AutocompleteMatch& match,
     gfx::RenderText* render_text,
-    bool contents,
+    RenderTextType render_text_type,
     gfx::Canvas* canvas,
     int x,
     int y,
@@ -400,8 +400,8 @@ int OmniboxResultView::DrawRenderText(
 
   // Infinite suggestions should appear with the leading ellipses vertically
   // stacked.
-  if (contents &&
-      (match.type == AutocompleteMatchType::SEARCH_SUGGEST_TAIL)) {
+  if (render_text_type == CONTENTS &&
+      match.type == AutocompleteMatchType::SEARCH_SUGGEST_TAIL) {
     // When the directionality of suggestion doesn't match the UI, we try to
     // vertically stack the ellipsis by restricting the end edge (right_x).
     const bool is_ui_rtl = base::i18n::IsRTL();
@@ -455,10 +455,13 @@ int OmniboxResultView::DrawRenderText(
     prefix_render_text->Draw(canvas);
   }
 
+  int height = (render_text_type == DESCRIPTION && match.answer) ?

[Peter Kasting, 2015/10/19 20:47:11]

Nit: const

I'd probably also place this line just below the comment below since it's really
"part of" the SetDisplayRect() call.

[tdanderson, 2015/10/20 14:20:15]

Done.

+      GetAnswerLineHeight() : GetContentLineHeight();
+
   // Set the display rect to trigger eliding.
   render_text->SetDisplayRect(
       gfx::Rect(mirroring_context_->mirrored_left_coord(x, right_x), y,
-                right_x - x, GetContentLineHeight()));
+                right_x - x, height));

[Peter Kasting, 2015/10/19 20:47:11]

Wow, wouldn't this have made the non-MD answer content mispositioned before? 
Unless GetContentsLineHeight() and GetAnswerLineHeight() had been returning the
same value...

[tdanderson, 2015/10/20 14:20:15]

Yes, without MD GetContentsLineHeight() was returning 25
and GetAnswerLineHeight() was returning 24, making this
go unnoticed. It showed up when I switched to hybrid where
the contents line height is 32.

   render_text->Draw(canvas);
   return right_x;
 }