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 47 matching lines @@
 
   ResultViewState GetState() const;
 
   // Returns the height of the text portion of the result view. In the base
   // class, this is the height of one line of text.
   virtual int GetTextHeight() const;
 
   // Returns the display width required for the match contents.
   int GetMatchContentsWidth() const;
 
+  // Store the image in a local data member and schedule a repaint.

[Peter Kasting, 2015/03/05 00:33:43]

Nit: Stores/schedules

[dschuyler, 2015/03/05 18:31:04]

Done.

+  void SetAnswerImage(gfx::ImageSkia image);

[Peter Kasting, 2015/03/05 00:33:43]

const &?

[dschuyler, 2015/03/05 18:31:04]

Both by-value and by-reference are used for ImageSkia.  I was passing by value
based on the comments below about ImageSkia.  Either will work, of course.  I'll
change it to a const ref.


  // ImageSkia is cheap to copy and intentionally supports copy semantics.
  ...
  // A refptr so that ImageRepSkia can be copied cheaply.
  scoped_refptr<internal::ImageSkiaStorage> storage_;

+
  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;
 
   // Draws given |render_text| on |canvas| at given location (|x|, |y|).
@@ skipping 68 matching lines @@
   // 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_;
+  BitmapFetcherService* image_service_;

[Peter Kasting, 2015/03/05 00:33:43]

Nit: May want to comment that this can be null while testing (assuming it can,
which is what I took away from your previous comments).

[dschuyler, 2015/03/05 18:31:04]

Done.

 
   const gfx::FontList font_list_;
   int font_height_;
 
   // A context used for mirroring regions.
   class MirroringContext;
   scoped_ptr<MirroringContext> mirroring_context_;
 
   AutocompleteMatch match_;
 
   gfx::Rect text_bounds_;
   gfx::Rect icon_bounds_;
 
   gfx::Rect keyword_text_bounds_;
   scoped_ptr<views::ImageView> keyword_icon_;
 
   scoped_ptr<gfx::SlideAnimation> animation_;
 
+  // If the answer has an icon, these control the fetching and updating
+  // of the icon.
+  BitmapFetcherService::RequestId request_id_;
+  gfx::ImageSkia answer_image_;
+
   // We preserve these RenderTexts so that we won't recreate them on every call
   // to GetMatchContentsWidth() or OnPaint().
   mutable scoped_ptr<gfx::RenderText> contents_rendertext_;
   mutable scoped_ptr<gfx::RenderText> description_rendertext_;
   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_;
 
+  base::WeakPtrFactory<OmniboxResultView> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(OmniboxResultView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_