Fix layout of omnibox rows for material design

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"
@@ skipping 99 matching lines @@
   // height differences.
   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(GetLayoutInsets(OMNIBOX_DROPDOWN_TEXT));
+  contents_rect.Inset(GetLayoutInsets(OMNIBOX_DROPDOWN));
   contents_rect.Inset(0, views::NonClientFrameView::kClientEdgeThickness, 0, 0);
 
   // In the non-material dropdown, the colored/clickable regions within the
   // dropdown are only as wide as the location bar. In the material version,
   // these are full width, and OmniboxResultView instead insets the icons/text
   // inside to be aligned with the location bar.
   if (!ui::MaterialDesignController::IsModeMaterial())
     contents_rect.Inset(start_margin_, 0, end_margin_, 0);
 
   int top = contents_rect.y();
@@ skipping 284 matching lines @@
 int OmniboxPopupContentsView::CalculatePopupHeight() {
   DCHECK_GE(static_cast<size_t>(child_count()), model_->result().size());
   int popup_height = 0;
   for (size_t i = 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.
   return popup_height + views::NonClientFrameView::kClientEdgeThickness +
-      GetLayoutInsets(OMNIBOX_DROPDOWN_TEXT).height() +
+      GetLayoutInsets(OMNIBOX_DROPDOWN).height() +
       bottom_shadow_->height() -
       GetLayoutConstant(OMNIBOX_DROPDOWN_BORDER_INTERIOR);
 }
 
 OmniboxResultView* OmniboxPopupContentsView::CreateResultView(
     int model_index,
     const gfx::FontList& font_list) {
   return new OmniboxResultView(this, model_index, location_bar_view_,
                                font_list);
 }
@@ skipping 89 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)));
 }