Change panels to use gfx::Image instead of SkBitmap for favicon.

chrome/browser/ui/panels/old_panel.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/old_panel.h"
 
+#include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/panels/panel_browser_window.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "ui/gfx/image/image.h"
 
 OldPanel::OldPanel(Browser* browser,
                    const gfx::Size& min_size, const gfx::Size& max_size)
     : Panel(browser->app_name(), min_size, max_size),
       browser_(browser) {
 }
 
 OldPanel::~OldPanel() {}
 
 Browser* OldPanel::browser() const {
@@ skipping 28 matching lines @@
 
 void OldPanel::OnWindowClosing() {
   browser_->OnWindowClosing();
 }
 
 void OldPanel::ExecuteCommandWithDisposition(
     int id, WindowOpenDisposition disposition) {
   chrome::ExecuteCommandWithDisposition(browser_, id, disposition);
 }
 
-SkBitmap OldPanel::GetCurrentPageIcon() const {
-  return browser_->GetCurrentPageIcon();
+gfx::Image OldPanel::GetCurrentPageIcon() const {
+  // Browser has not been changed to return SkBitmap yet so we get the favicon
+  // directly rather than use browser_->GetCurrentPageIcon().
+  TabContents* contents = chrome::GetActiveTabContents(browser_);
+  return contents ? contents->favicon_tab_helper()->GetFavicon() : gfx::Image();
 }