| Index: chrome/browser/ui/views/omnibox/omnibox_result_view.h | 
| diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.h b/chrome/browser/ui/views/omnibox/omnibox_result_view.h | 
| index 099027c6c88594f248a8c95723570b1f8d1ff9f1..1df1b2caacc089703851e6b503cd4f3951b7e4fd 100644 | 
| --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.h | 
| +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.h | 
| @@ -10,6 +10,7 @@ | 
| #include "base/gtest_prod_util.h" | 
| #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h" | 
| #include "components/omnibox/autocomplete_match.h" | 
| +#include "components/omnibox/suggestion_answer.h" | 
| #include "third_party/skia/include/core/SkColor.h" | 
| #include "ui/gfx/animation/animation_delegate.h" | 
| #include "ui/gfx/animation/slide_animation.h" | 
| @@ -47,6 +48,10 @@ class OmniboxResultView : public views::View, | 
| NUM_KINDS | 
| }; | 
|  | 
| +  // The minimum distance between the top and bottom of the text and the | 
| +  // top or bottom of the row. | 
| +  static const int kMinimumTextVerticalPadding = 3; | 
| + | 
| OmniboxResultView(OmniboxPopupContentsView* model, | 
| int model_index, | 
| LocationBarView* location_bar_view, | 
| @@ -117,9 +122,6 @@ class OmniboxResultView : public views::View, | 
|  | 
| void set_edge_item_padding(int value) { edge_item_padding_ = value; } | 
| void set_item_padding(int value) { item_padding_ = value; } | 
| -  void set_minimum_text_vertical_padding(int value) { | 
| -    minimum_text_vertical_padding_ = value; | 
| -  } | 
|  | 
| private: | 
| // views::View: | 
| @@ -155,12 +157,16 @@ class OmniboxResultView : public views::View, | 
| bool is_ui_rtl, | 
| bool is_match_contents_rtl) const; | 
|  | 
| +  int GetAnswerLineHeight() const; | 
| +  int GetContentLineHeight() const; | 
| + | 
| +  void AppendAnswerText(const SuggestionAnswer::TextField& text_field); | 
| + | 
| static int default_icon_size_; | 
|  | 
| // Default values cached here, may be overridden using the setters above. | 
| int edge_item_padding_; | 
| int item_padding_; | 
| -  int minimum_text_vertical_padding_; | 
|  | 
| // This row's model and model index. | 
| OmniboxPopupContentsView* model_; | 
|  |