[AiS] for desktop, two lines and font sytles

chrome/browser/ui/views/omnibox/omnibox_popup_contents_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.
 
 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
 
 #include <algorithm>
 
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
 #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"
 #include "ui/gfx/path.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/view_targeter.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
@@ skipping 36 matching lines @@
     OmniboxView* omnibox_view,
     OmniboxEditModel* edit_model,
     LocationBarView* location_bar_view)
     : model_(new OmniboxPopupModel(this, edit_model)),
       omnibox_view_(omnibox_view),
       location_bar_view_(location_bar_view),
       font_list_(font_list),
       ignore_mouse_drag_(false),
       size_animation_(this),
       left_margin_(0),
-      right_margin_(0),
-      outside_vertical_padding_(0) {
+      right_margin_(0) {
   // The contents is owned by the LocationBarView.
   set_owned_by_client();
 
   ui::ThemeProvider* theme = location_bar_view_->GetThemeProvider();
   bottom_shadow_ = theme->GetImageSkiaNamed(IDR_BUBBLE_B);
 
   SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
 }
 
@@ skipping 26 matching lines @@
   int current_height_delta = static_cast<int>(
       size_animation_.GetCurrentValue() * total_height_delta - 0.5);
   current_frame_bounds.set_height(
       current_frame_bounds.height() + current_height_delta);
   return current_frame_bounds;
 }
 
 void OmniboxPopupContentsView::LayoutChildren() {
   gfx::Rect contents_rect = GetContentsBounds();
 
-  contents_rect.Inset(left_margin_,
-                      views::NonClientFrameView::kClientEdgeThickness +
-                          outside_vertical_padding_,
-                      right_margin_, outside_vertical_padding_);
+  contents_rect.Inset(
+      left_margin_, views::NonClientFrameView::kClientEdgeThickness +
+                        OmniboxResultView::kMinimumTextVerticalPadding,
+      right_margin_, OmniboxResultView::kMinimumTextVerticalPadding);
   int top = contents_rect.y();
   for (size_t i = 0; i < AutocompleteResult::kMaxMatches; ++i) {
     View* v = child_at(i);
     if (v->visible()) {
       v->SetBounds(contents_rect.x(), top, contents_rect.width(),
                    v->GetPreferredSize().height());
       top = v->bounds().bottom();
     }
   }
 }
@@ skipping 249 matching lines @@
   DCHECK_GE(static_cast<size_t>(child_count()), model_->result().size());
   int popup_height = 0;
   for (size_t i = model_->result().ShouldHideTopMatch() ? 1 : 0;
        i < model_->result().size(); ++i)
     popup_height += child_at(i)->GetPreferredSize().height();
 
   // Add enough space on the top and bottom so it looks like there is the same
   // 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.
   return popup_height +
-         views::NonClientFrameView::kClientEdgeThickness +  // Top border.
-         outside_vertical_padding_ * 2 +                    // Padding.
-         bottom_shadow_->height() - kBorderInterior;        // Bottom border.
+         views::NonClientFrameView::kClientEdgeThickness +     // Top border.
+         OmniboxResultView::kMinimumTextVerticalPadding * 2 +  // Padding.
+         bottom_shadow_->height() - kBorderInterior;           // Bottom border.
 }
 
 OmniboxResultView* OmniboxPopupContentsView::CreateResultView(
     int model_index,
     const gfx::FontList& font_list) {
   return new OmniboxResultView(this, model_index, location_bar_view_,
                                font_list);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 94 matching lines @@
   size_t index = GetIndexForPoint(event.location());
   if (!HasMatchAt(index))
     return;
   omnibox_view_->OpenMatch(model_->result().match_at(index), disposition,
                            GURL(), base::string16(), index);
 }
 
 OmniboxResultView* OmniboxPopupContentsView::result_view_at(size_t i) {
   return static_cast<OmniboxResultView*>(child_at(static_cast<int>(i)));
 }