[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..e89948cd56d989a098d21f89275fcd5628381465 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"
@@ -20,6 +21,7 @@
 
 class LocationBarView;
 class OmniboxPopupContentsView;
+struct TextStyle;
 
 namespace gfx {
 class Canvas;
@@ -47,6 +49,13 @@ class OmniboxResultView : public views::View,
     NUM_KINDS
   };
 
+  // The minimum distance between the top and bottom of the {icon|text} and the
+  // top or bottom of the row.
+  enum {
+    kMinimumIconVerticalPadding = 2,

[Peter Kasting, 2015/03/17 22:01:44]

The icon padding should still be a file-scoped constant in the .cc file because
no one else needs to access it.

[dschuyler, 2015/03/17 22:57:55]

Done.

+    kMinimumTextVerticalPadding = 3,

[Peter Kasting, 2015/03/17 22:01:44]

Don't use the "enum hack" to declare constants like this; declare this as a
const int instead.  (We're compiling in C++11 mode, so that ought to work
everywhere.)

[dschuyler, 2015/03/17 22:57:55]

Done.

+  };
+
   OmniboxResultView(OmniboxPopupContentsView* model,
                     int model_index,
                     LocationBarView* location_bar_view,
@@ -117,9 +126,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 +161,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 TextStyle& text_style) 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_;