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

chrome/browser/ui/panels/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/panel.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/ui/panels/panel_strip.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.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/user_metrics.h"
 #include "content/public/browser/web_contents.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 
 using content::RenderViewHost;
 using content::UserMetricsAction;
 
 namespace panel_internal {
 
 class PanelExtensionWindowController : public extensions::WindowController {
  public:
   PanelExtensionWindowController(Panel* panel, Profile* profile);
@@ skipping 689 matching lines @@
 // static
 void Panel::FormatTitleForDisplay(string16* title) {
   size_t current_index = 0;
   size_t match_index;
   while ((match_index = title->find(L'\n', current_index)) != string16::npos) {
     title->replace(match_index, 1, string16());
     current_index = match_index;
   }
 }
 
-SkBitmap Panel::GetCurrentPageIcon() const {
+gfx::Image Panel::GetCurrentPageIcon() const {
   return panel_host_->GetPageIcon();
 }
 
 void Panel::UpdateTitleBar() {
   native_panel_->UpdatePanelTitleBar();
 }
 
 void Panel::LoadingStateChanged(bool is_loading) {
   command_updater_.UpdateCommandEnabled(IDC_STOP, is_loading);
   native_panel_->UpdatePanelLoadingAnimations(is_loading);
   UpdateTitleBar();
 }
 
 void Panel::WebContentsFocused(content::WebContents* contents) {
   native_panel_->PanelWebContentsFocused(contents);
 }