Answers in Suggest icon downloading

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 "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/views/controls/image_view.h"
 #include "ui/views/view.h"
 
 class LocationBarView;
@@ skipping 54 matching lines @@
   // Returns the display width required for the match contents.
   int GetMatchContentsWidth() const;
 
  protected:
   // Paints the given |match| using the RenderText instances |contents| and
   // |description| at offset |x| in the bounds of this view.
   virtual void PaintMatch(const AutocompleteMatch& match,
                           gfx::RenderText* contents,
                           gfx::RenderText* description,
                           gfx::Canvas* canvas,
-                          int x) const;
+                          int x);
 
   // Draws given |render_text| on |canvas| at given location (|x|, |y|).
   // |contents| indicates whether the |render_text| is for the match contents
   // (rather than the separator or the description).  Additional properties from
   // |match| are used to render Infinite suggestions correctly.  If |max_width|
   // is a non-negative number, the text will be elided to fit within
   // |max_width|.  Returns the x position to the right of the string.
   int DrawRenderText(const AutocompleteMatch& match,
                      gfx::RenderText* render_text,
                      bool contents,
@@ skipping 18 matching lines @@
   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 GetAnswerIcon();
   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
   // the keyword match will hide even the icon of the regular match.
   bool ShowOnlyKeywordMatch() const;
 
   // Resets all RenderTexts for contents and description of the |match_| and its
   // associated keyword match.
@@ skipping 12 matching lines @@
 
   // 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;
 
   static int default_icon_size_;
 
+  // If the answer has an icon, these control the fetching and updating
+  // of the icon.
+  BitmapFetcherService::RequestId request_id_;

[Peter Kasting, 2015/02/13 03:01:07]

I would consider making the members here mutable and making the other functions
you've added/touched be const.  From the perspective of a consumer of the class,
this is invisible implementation detail and the apparent class state isn't
changed, so const functions are more appropriate.

+  GURL image_url_;

[groby-ooo-7-16, 2015/02/13 02:30:56]

I don't think you need |image_url_|. 

+  gfx::ImageSkia answer_image_;
+
   // 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_;
@@ skipping 22 matching lines @@
   mutable scoped_ptr<gfx::RenderText> separator_rendertext_;
   mutable scoped_ptr<gfx::RenderText> keyword_contents_rendertext_;
   mutable scoped_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_