Create c/b/ui/views/layout_constants.*.

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/views/layout_constants.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/browser/omnibox_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 #include "ui/compositor/clip_transform_recorder.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
@@ skipping 87 matching lines @@
   // white pixels at the bottom of the popup as long when animating very small
   // 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() {
-  ui::ThemeProvider* theme_provider = location_bar_view_->GetThemeProvider();
-  const int min_vertical_padding = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_OMNIBOX_DROPDOWN_MIN_TEXT_VERTICAL_PADDING);
-
   gfx::Rect contents_rect = GetContentsBounds();
-  contents_rect.Inset(
-      0, views::NonClientFrameView::kClientEdgeThickness + min_vertical_padding,
-      0, min_vertical_padding);
+  contents_rect.Inset(GetLayoutInsets(OMNIBOX_DROPDOWN_TEXT));
+  contents_rect.Inset(0, views::NonClientFrameView::kClientEdgeThickness, 0, 0);

[jonross, 2015/09/14 15:27:10]

Incorporate into OMNIBOX_DROPDOWN_TEXT?

[Peter Kasting, 2015/09/14 21:06:31]

Not all callers want this inclusion.

[jonross, 2015/09/14 23:46:43]

Acknowledged.

 
   // 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();
   for (size_t i = 0; i < AutocompleteResult::kMaxMatches; ++i) {
@@ skipping 279 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxPopupContentsView, protected:
 
 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();
 
-  ui::ThemeProvider* theme_provider = location_bar_view_->GetThemeProvider();
-  const int min_text_vertical_padding = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_OMNIBOX_DROPDOWN_MIN_TEXT_VERTICAL_PADDING);
-  const int border_interior = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_OMNIBOX_DROPDOWN_BORDER_INTERIOR);
-
   // 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.
-  //
-  // The * 2 accounts for vertical padding used at the top and bottom.
-  return popup_height +
-         views::NonClientFrameView::kClientEdgeThickness +     // Top border.
-         min_text_vertical_padding * 2 +                       // Padding.
-         bottom_shadow_->height() - border_interior;           // Bottom border.
+  return popup_height + views::NonClientFrameView::kClientEdgeThickness +
+      GetLayoutInsets(OMNIBOX_DROPDOWN_TEXT).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 15 matching lines @@
             ThemeProperties::COLOR_TOOLBAR_SEPARATOR));
   }
 
   // Bottom border.
   canvas->TileImageInt(*bottom_shadow_, 0, height() - bottom_shadow_->height(),
                        width(), bottom_shadow_->height());
 }
 
 void OmniboxPopupContentsView::PaintChildren(const ui::PaintContext& context) {
   gfx::Rect contents_bounds = GetContentsBounds();
-  ui::ThemeProvider* theme_provider = location_bar_view_->GetThemeProvider();
-  const int border_interior = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_OMNIBOX_DROPDOWN_BORDER_INTERIOR);
-
+  const int interior = GetLayoutConstant(OMNIBOX_DROPDOWN_BORDER_INTERIOR);
   contents_bounds.Inset(0, views::NonClientFrameView::kClientEdgeThickness, 0,
-                        bottom_shadow_->height() - border_interior);
+                        bottom_shadow_->height() - interior);
 
   ui::ClipTransformRecorder clip_transform_recorder(context);
   clip_transform_recorder.ClipRect(contents_bounds);
   {
     ui::PaintRecorder recorder(context, size());
     SkColor background_color = result_view_at(0)->GetColor(
         OmniboxResultView::NORMAL, OmniboxResultView::BACKGROUND);
     recorder.canvas()->DrawColor(background_color);
   }
   View::PaintChildren(context);
@@ skipping 49 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)));
 }