Make some updates to extension iconography.

chrome/browser/extensions/menu_manager.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_EXTENSIONS_MENU_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_MENU_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_icon_manager.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/extension_registry_observer.h"
 #include "extensions/common/url_pattern_set.h"
-
-class SkBitmap;
+#include "ui/gfx/image/image.h"
 
 namespace content {
 class BrowserContext;
 class RenderFrameHost;
 class WebContents;
 struct ContextMenuParams;
 }
 
 namespace extensions {
 class Extension;
@@ skipping 297 matching lines @@
   // Returns true if the item was found or false otherwise.
   bool ItemUpdated(const MenuItem::Id& id);
 
   // Called when a menu item is clicked on by the user.
   void ExecuteCommand(content::BrowserContext* context,
                       content::WebContents* web_contents,
                       content::RenderFrameHost* render_frame_host,
                       const content::ContextMenuParams& params,
                       const MenuItem::Id& menu_item_id);
 
-  // This returns a bitmap of width/height kFaviconSize, loaded either from an
+  // This returns a image of width/height kFaviconSize, loaded either from an
   // entry specified in the extension's 'icon' section of the manifest, or a
   // default extension icon.
-  const SkBitmap& GetIconForExtension(const std::string& extension_id);
+  gfx::Image GetIconForExtension(const std::string& extension_id);
 
   // content::NotificationObserver implementation.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   // ExtensionRegistryObserver implementation.
   void OnExtensionLoaded(content::BrowserContext* browser_context,
                          const Extension* extension) override;
   void OnExtensionUnloaded(content::BrowserContext* browser_context,
@@ skipping 49 matching lines @@
 
   // Owned by ExtensionSystem.
   StateStore* store_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuManager);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_MENU_MANAGER_H_