Convert mostly favicon related code from SkBitmap to ImageSkia and Image

chrome/browser/ui/browser.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_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 36 matching lines @@
 class BrowserContentSettingBubbleModelDelegate;
 class BrowserSyncedWindowDelegate;
 class BrowserToolbarModelDelegate;
 class BrowserTabRestoreServiceDelegate;
 class BrowserWindow;
 class DeviceAttachedIntentSource;
 class FindBarController;
 class FullscreenController;
 class PrefService;
 class Profile;
-class SkBitmap;
 class StatusBubble;
 class TabNavigation;
 class TabStripModel;
 class TabStripModelDelegate;
 struct WebApplicationInfo;
 
 namespace chrome {
 class BrowserCommandController;
 class BrowserInstantController;
 class UnloadController;
 namespace search {
 class SearchDelegate;
 class SearchModel;
 }
 }
 
 namespace content {
 class NavigationController;
 class SessionStorageNamespace;
 }
 
 namespace extensions {
 class Extension;
 class WindowController;
 }
 
 namespace gfx {
+class Image;
 class Point;
 }
 
 namespace ui {
 struct SelectedFileInfo;
 class WebDialogDelegate;
 }
 
 namespace webkit_glue {
 struct WebIntentServiceData;
@@ skipping 179 matching lines @@
 
   // Returns true if a FindBarController exists for this browser.
   bool HasFindBarController() const;
 
   // Returns the state of the bookmark bar.
   BookmarkBar::State bookmark_bar_state() const { return bookmark_bar_state_; }
 
   // State Storage and Retrieval for UI ///////////////////////////////////////
 
   // Gets the Favicon of the page in the selected tab.
-  SkBitmap GetCurrentPageIcon() const;
+  gfx::Image GetCurrentPageIcon() const;
 
   // Gets the title of the window based on the selected tab's title.
   string16 GetWindowTitleForCurrentTab() const;
 
   // Prepares a title string for display (removes embedded newlines, etc).
   static void FormatTitleForDisplay(string16* title);
 
   // OnBeforeUnload handling //////////////////////////////////////////////////
 
   // Gives beforeunload handlers the chance to cancel the close.
@@ skipping 628 matching lines @@
   bool window_has_shown_;
 
   // Currently open color chooser. Non-NULL after OpenColorChooser is called and
   // before DidEndColorChooser is called.
   scoped_ptr<content::ColorChooser> color_chooser_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_