[AiS] for desktop, two lines and font sytles

chrome/browser/ui/views/omnibox/omnibox_result_view.h

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..ddbf84cfbb3a82e4076dbbbb04f8cc8aa27115b6 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_result_view.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.h
@@ -10,11 +10,13 @@
 #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"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/view.h"
 
@@ -47,6 +49,16 @@ class OmniboxResultView : public views::View,
     NUM_KINDS
   };
 
+  struct StateColors {

[Peter Kasting, 2015/03/18 00:36:19]

Why did you choose to do this with a struct rather than an array?  The array
made things shorter and simpler, but this struct makes the code more complex,
because now you still have GetStateColor(), but you also have nested structs. 
Basically the code got strictly worse instead of improving :(

[dschuyler, 2015/03/18 01:02:36]

Is this patch more like what you were hoping for?
Done.

+    ui::NativeTheme::ColorId normal;
+    ui::NativeTheme::ColorId hovered;
+    ui::NativeTheme::ColorId selected;
+  };
+
+  // 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 +129,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 +164,21 @@ class OmniboxResultView : public views::View,
                        bool is_ui_rtl,
                        bool is_match_contents_rtl) const;
 
+  int StyleAnswerText(gfx::RenderText* render_text,
+                      int offset,
+                      const SuggestionAnswer::TextField& text_field) const;
+
+  int GetAnswerLineHeight() const;
+  int GetContentLineHeight() const;
+  SkColor GetStateColor(const StateColors& state_colors) const;
+  void AppendAnswerText(gfx::RenderText* render_text,
+                        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_;