Revert of Delete pre-MD code from OmniboxResultView

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 <stddef.h>
 
 #include <vector>
@@ skipping 32 matching lines @@
   enum ColorKind {
     BACKGROUND = 0,
     TEXT,
     DIMMED_TEXT,
     URL,
     NUM_KINDS
   };
 
   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
   // model has changed.
   void SetMatch(const AutocompleteMatch& match);
 
@@ skipping 62 matching lines @@
       bool force_dim) const;
 
   const gfx::Rect& text_bounds() const { return text_bounds_; }
 
  private:
   // views::View:
   const char* GetClassName() const override;
 
   gfx::ImageSkia GetIcon() const;
 
+  gfx::ImageSkia GetKeywordIcon() const;
+
   // Utility function for creating vector icons.
   gfx::ImageSkia GetVectorIcon(gfx::VectorIconId icon_id) 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
   // the keyword match will hide even the icon of the regular match.
   bool ShowOnlyKeywordMatch() const;
 
   // Initializes |contents_rendertext_| if it is NULL.
   void InitContentsRenderTextIfNecessary() const;
@@ skipping 29 matching lines @@
                         const base::string16& text,
                         int text_type) const;
 
   // AppendAnswerText will break up the |text| into bold and non-bold pieces
   // and pass each to this helper with the correct |is_bold| value.
   void AppendAnswerTextHelper(gfx::RenderText* destination,
                               const base::string16& text,
                               int text_type,
                               bool is_bold) const;
 
+  static int default_icon_size_;
+
   // This row's model and model index.
   OmniboxPopupContentsView* model_;
   size_t model_index_;
 
+  LocationBarView* location_bar_view_;
+
   const gfx::FontList font_list_;
   int font_height_;
 
   // A context used for mirroring regions.
   class MirroringContext;
   std::unique_ptr<MirroringContext> mirroring_context_;
 
   AutocompleteMatch match_;
 
   gfx::Rect text_bounds_;
@@ skipping 14 matching lines @@
   mutable std::unique_ptr<gfx::RenderText> separator_rendertext_;
   mutable std::unique_ptr<gfx::RenderText> keyword_contents_rendertext_;
   mutable std::unique_ptr<gfx::RenderText> keyword_description_rendertext_;
 
   mutable int separator_width_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxResultView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_