Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

chrome/browser/ui/views/autocomplete/autocomplete_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_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_VIEW_H_
 #pragma once
 
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 76 matching lines @@
 
   struct RunData;
   typedef std::vector<RunData> Runs;
 
   // Predicate functions for use when sorting the runs.
   static bool SortRunsLogically(const RunData& lhs, const RunData& rhs);
   static bool SortRunsVisually(const RunData& lhs, const RunData& rhs);
 
   ResultViewState GetState() const;
   const SkBitmap* GetIcon() const;
-  const SkBitmap* GetKeywordIcon() const;
+  const gfx::ImageSkia* GetKeywordIcon() const;
 
   // Elides |runs| to fit in |remaining_width|.  The runs in |runs| should be in
   // logical order.
   //
   // When we need to elide a run, the ellipsis will be placed at the end of that
   // run.  This means that if we elide a run whose visual direction is opposite
   // that of the drawing context, the ellipsis will not be at the "end" of the
   // drawn string.  For example, if in an LTR context we have the LTR run
   // "LTR_STRING" and the RTL run "RTL_STRING", the unelided text would be drawn
   // like:
@@ skipping 35 matching lines @@
 
   gfx::Rect keyword_text_bounds_;
   scoped_ptr<views::ImageView> keyword_icon_;
 
   scoped_ptr<ui::SlideAnimation> animation_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteResultView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_RESULT_VIEW_H_