[AiS] for desktop, two lines and font sytles

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

Index: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
index fe061f65a9c0175152fd9e6d013d990b650f4663..0a67043b68ff624c7c8323d278acf07614dc4f32 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h"
+#include "components/omnibox/omnibox_field_trial.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
@@ -388,14 +389,11 @@ int OmniboxPopupContentsView::CalculatePopupHeight() {
   // amount of space between the text and the popup border as there is in the
   // interior between each row of text.
   //
-  // Discovering the exact amount of leading and padding around the font is
-  // a bit tricky and platform-specific, but this computation seems to work in
-  // practice.
-  OmniboxResultView* result_view = result_view_at(0);
-  outside_vertical_padding_ =
-      (result_view->GetPreferredSize().height() -
-       result_view->GetTextHeight());
+  // The * 2 accounts for vertical padding used at the top and bottom of each
+  // row.
 
+  outside_vertical_padding_ =
+      OmniboxResultView::kMinimumTextVerticalPadding * 2;

[Peter Kasting, 2015/03/17 22:01:44]

Man, the more times I look at this code the more I find was wrong :P.

It turns out the * 2 is a mistake.  If we want the space between e.g. the bottom
row and the bottom border to match, we should just be using
kMinimumVerticalTextPadding directly.  This is because we'll already have one
copy of that padding present in the bottom row, so we just need one more.  I
verified on a Chrome screenshot that this would look more correct.

So what I would do is eliminate this member variable entirely, and use
OmniboxResultView::kMinimumTextVerticalPadding directly everywhere we currently
use |outside_vertical_padding_|.

[dschuyler, 2015/03/17 22:57:55]

It's mostly an aesthetic choice, so all the changes have been variations of
right (not wrong)  :)
Done.

   return popup_height +
          views::NonClientFrameView::kClientEdgeThickness +  // Top border.
          outside_vertical_padding_ * 2 +                    // Padding.