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

chrome/browser/ui/views/omnibox/omnibox_result_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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
 #endif
 
 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h"
 
 #include <algorithm>  // NOLINT
 
 #include "base/i18n/bidi_line_iterator.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.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_popup_contents_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "grit/components_scaled_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 316 matching lines @@
     if (match.answer) {
       y += GetContentLineHeight();
       if (!answer_image_.isNull()) {
         int answer_icon_size = GetAnswerLineHeight();
         canvas->DrawImageInt(
             answer_image_,
             0, 0, answer_image_.width(), answer_image_.height(),
             GetMirroredXInView(x), y, answer_icon_size, answer_icon_size, true);
         // See TODO in Layout().
         x += answer_icon_size +
-             location_bar_view_->GetThemeProvider()->GetDisplayProperty(
-                 ThemeProperties::PROPERTY_ICON_LABEL_VIEW_TRAILING_PADDING);
+             GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING);
       }
     } else {
       x = DrawRenderText(match, separator_rendertext_.get(), false, canvas,
                          after_contents_x, y, separator_width_);
     }
 
     DrawRenderText(match, description, false, canvas, x, y,
                    description_max_width);
   }
 }
@@ skipping 233 matching lines @@
 
 void OmniboxResultView::InitContentsRenderTextIfNecessary() const {
   if (!contents_rendertext_) {
     contents_rendertext_.reset(
         CreateClassifiedRenderText(
             match_.contents, match_.contents_class, false).release());
   }
 }
 
 void OmniboxResultView::Layout() {
-  const gfx::ImageSkia icon = GetIcon();
-  // TODO(jonross): Currently |location_bar_view_| provides the correct
-  // ThemeProvider, as it is loaded on the BrowserFrame widget. The root widget
-  // for OmniboxResultView is AutocompletePopupWidget, which is not loading the
-  // theme. We should update the omnibox code to also track its own
-  // ThemeProvider in order to reduce dependancy on LocationBarView.
-  ui::ThemeProvider* theme_provider = location_bar_view_->GetThemeProvider();
-  // |theme_provider| can be null when animations are running during shutdown,
-  // after OmniboxResultView has been removed from the tree of Views.
-  if (!theme_provider)
-    return;
-  const int horizontal_padding = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_LOCATION_BAR_HORIZONTAL_PADDING);
-  const int trailing_padding = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_ICON_LABEL_VIEW_TRAILING_PADDING);
-
+  const int horizontal_padding =
+      GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
   const int start_x = StartMargin() + horizontal_padding;
   const int end_x = width() - EndMargin() - horizontal_padding;
 
+  const gfx::ImageSkia icon = GetIcon();
   icon_bounds_.SetRect(
-      start_x + ((icon.width() == default_icon_size_) ? 0 : trailing_padding),
+      start_x + ((icon.width() == default_icon_size_) ?
+          0 : GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING)),
       (GetContentLineHeight() - icon.height()) / 2,
       icon.width(), icon.height());
 
   const int text_x = start_x + default_icon_size_ + horizontal_padding;
   int text_width = end_x - text_x;
 
   if (match_.associated_keyword.get()) {
     const int max_kw_x = end_x - keyword_icon_->width();
     const int kw_x = animation_->CurrentValueBetween(max_kw_x, start_x);
     const int kw_text_x = kw_x + keyword_icon_->width() + horizontal_padding;
@@ skipping 72 matching lines @@
 
 int OmniboxResultView::GetAnswerLineHeight() const {
   // GetTextStyle(1) is the largest font used and so defines the boundary that
   // all the other answer styles fit within.
   return ui::ResourceBundle::GetSharedInstance()
       .GetFontList(GetTextStyle(1).font)
       .GetHeight();
 }
 
 int OmniboxResultView::GetContentLineHeight() const {
-  ui::ThemeProvider* theme_provider = location_bar_view_->GetThemeProvider();
-  const int min_icon_vertical_padding = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_OMNIBOX_DROPDOWN_MIN_ICON_VERTICAL_PADDING);
-  const int min_text_vertical_padding = theme_provider->GetDisplayProperty(
-      ThemeProperties::PROPERTY_OMNIBOX_DROPDOWN_MIN_TEXT_VERTICAL_PADDING);
-
-  return std::max(default_icon_size_ + (min_icon_vertical_padding * 2),
-                  GetTextHeight() + (min_text_vertical_padding * 2));
+  return std::max(
+      default_icon_size_ + GetLayoutInsets(OMNIBOX_DROPDOWN_ICON).height(),
+      GetTextHeight() + GetLayoutInsets(OMNIBOX_DROPDOWN_TEXT).height());
 }
 
 scoped_ptr<gfx::RenderText> OmniboxResultView::CreateAnswerLine(
     const SuggestionAnswer::ImageLine& line,
     gfx::FontList font_list) {
   scoped_ptr<gfx::RenderText> destination = CreateRenderText(base::string16());
   destination->SetFontList(font_list);
 
   for (const SuggestionAnswer::TextField& text_field : line.text_fields())
     AppendAnswerText(destination.get(), text_field.text(), text_field.type());
@@ skipping 59 matching lines @@
 
 int OmniboxResultView::StartMargin() const {
   return ui::MaterialDesignController::IsModeMaterial() ?
       model_->start_margin() : 0;
 }
 
 int OmniboxResultView::EndMargin() const {
   return ui::MaterialDesignController::IsModeMaterial() ?
       model_->end_margin() : 0;
 }