[AiS] for desktop, two lines and font sytles

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_
 
 #include <vector>
 
 #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"

[msw, 2015/03/18 18:03:37]

Why is this needed here?

[dschuyler, 2015/03/18 19:16:49]

That would be another holdover from a prior patch in this CL.  Thanks for
pointing that out.  Removed.

Done.

 #include "ui/views/controls/image_view.h"
 #include "ui/views/view.h"
 
 class LocationBarView;
 class OmniboxPopupContentsView;
 
 namespace gfx {
 class Canvas;
 class RenderText;
 }
@@ skipping 12 matching lines @@
 
   enum ColorKind {
     BACKGROUND = 0,
     TEXT,
     DIMMED_TEXT,
     URL,
     DIVIDER,
     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,
                     const gfx::FontList& font_list);
   ~OmniboxResultView() override;
 
   SkColor GetColor(ResultViewState state, ColorKind kind) const;
 
   // Updates the match used to paint the contents of this result view. We copy
   // the match so that we can continue to paint the last result even after the
@@ skipping 50 matching lines @@
   // |classifications| and |force_dim| are used to style the text.
   scoped_ptr<gfx::RenderText> CreateClassifiedRenderText(
       const base::string16& text,
       const ACMatchClassifications& classifications,
       bool force_dim) const;
 
   const gfx::Rect& text_bounds() const { return text_bounds_; }
 
   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:
   const char* GetClassName() const override;
 
   gfx::ImageSkia GetIcon() const;
   const gfx::ImageSkia* GetKeywordIcon() const;
 
   // Whether to render only the keyword match.  Returns true if |match_| has an
   // associated keyword match that has been animated so close to the start that
@@ skipping 15 matching lines @@
   // gfx::AnimationDelegate:
   void AnimationProgressed(const gfx::Animation* animation) override;
 
   // Returns the offset at which the contents of the |match| should be displayed
   // within the text bounds. The directionality of UI and match contents is used
   // to determine the offset relative to the correct edge.
   int GetDisplayOffset(const AutocompleteMatch& match,
                        bool is_ui_rtl,
                        bool is_match_contents_rtl) const;
 
+  int GetAnswerLineHeight() const;
+  int GetContentLineHeight() 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_;
   size_t model_index_;
 
   LocationBarView* location_bar_view_;
   // Note: image_service_ may be null in some unit tests.
   BitmapFetcherService* image_service_;
 
   const gfx::FontList font_list_;
@@ skipping 27 matching lines @@
   mutable scoped_ptr<gfx::RenderText> keyword_description_rendertext_;
 
   mutable int separator_width_;
 
   base::WeakPtrFactory<OmniboxResultView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxResultView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_