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

chrome/browser/ui/panels/panel_host.cc

 // 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.
 
 #include "chrome/browser/ui/panels/panel_host.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/gfx/image/image.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/rect.h"
 
 using content::UserMetricsAction;
 
 PanelHost::PanelHost(Panel* panel, Profile* profile)
     : panel_(panel),
       profile_(profile),
@@ skipping 20 matching lines @@
   web_contents_->GetController().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
 }
 
 void PanelHost::DestroyWebContents() {
   web_contents_.reset();
   favicon_tab_helper_.reset();
 }
 
 SkBitmap PanelHost::GetPageIcon() const {
+  // TODO: Make this function return gfx::Image.

[jennb, 2012/08/03 16:55:36]

What's needed to make this return gfx::Image? Simple enough to do in this patch?
Would really appreciate that - I've been waiting for the favicon SkBitmap->Image
changeover...

[Nico, 2012/08/03 19:09:54]

I don't know how involved that is. I'd prefer not to do it in this patch ('cause
I don't know how much work it'd be).

   return favicon_tab_helper_.get() ?
-      favicon_tab_helper_->GetFavicon() : SkBitmap();
+      favicon_tab_helper_->GetFavicon().AsBitmap() : SkBitmap();
 }
 
 void PanelHost::NavigationStateChanged(const content::WebContents* source,
                                        unsigned changed_flags) {
   // Only need to update the title if the title changed while not loading,
   // because the title is also updated when loading state changes.
   if ((changed_flags & content::INVALIDATE_TYPE_TAB) ||
       ((changed_flags & content::INVALIDATE_TYPE_TITLE) &&
        !source->IsLoading()))
     panel_->UpdateTitleBar();
@@ skipping 104 matching lines @@
 }
 
 void PanelHost::StopLoading() {
   content::RecordAction(UserMetricsAction("Stop"));
   web_contents_->Stop();
 }
 
 void PanelHost::Zoom(content::PageZoom zoom) {
   chrome_page_zoom::Zoom(web_contents_.get(), zoom);
 }