Change return type of FaviconTabHelper::GetFavicon() to gfx::Image.

chrome/browser/favicon/favicon_tab_helper.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_FAVICON_FAVICON_TAB_HELPER_H_
 #define CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "chrome/browser/favicon/favicon_handler_delegate.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/common/favicon_url.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "googleurl/src/gurl.h"
 
+namespace gfx {
+class Image;
+}
+
 class FaviconHandler;
 class SkBitmap;
 
 // FaviconTabHelper works with FaviconHandlers to fetch the favicons.
 //
 // FetchFavicon fetches the given page's icons. It requests the icons from the
 // history backend. If the icon is not available or expired, the icon will be
 // downloaded and saved in the history backend.
 //
 // DownloadImage downloads the specified icon and returns it through the given
 // callback.
 //
 class FaviconTabHelper : public content::WebContentsObserver,
                          public FaviconHandlerDelegate {
  public:
   explicit FaviconTabHelper(content::WebContents* web_contents);
   virtual ~FaviconTabHelper();
 
   // Initiates loading the favicon for the specified url.
   void FetchFavicon(const GURL& url);
 
   // Returns the favicon for this tab, or IDR_DEFAULT_FAVICON if the tab does
   // not have a favicon. The default implementation uses the current navigation
-  // entry. This will return an isNull bitmap if there are no navigation
+  // entry. This will return an empty bitmap if there are no navigation
   // entries, which should rarely happen.
-  SkBitmap GetFavicon() const;
+  gfx::Image GetFavicon() const;
 
   // Returns true if we have the favicon for the page.
   bool FaviconIsValid() const;
 
   // Returns whether the favicon should be displayed. If this returns false, no
   // space is provided for the favicon, and the favicon is never displayed.
   virtual bool ShouldDisplayFavicon();
 
   // Saves the favicon for the current page.
   void SaveFavicon();
@@ skipping 42 matching lines @@
   scoped_ptr<FaviconHandler> favicon_handler_;
 
   // Handles downloading touchicons. It is NULL if
   // browser_defaults::kEnableTouchIcon is false.
   scoped_ptr<FaviconHandler> touch_icon_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconTabHelper);
 };
 
 #endif  // CHROME_BROWSER_FAVICON_FAVICON_TAB_HELPER_H_