Show icons for custom menuitems in contextmenu.

components/renderer_context_menu/render_view_context_menu_base.h

 // Copyright 2014 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 COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_
 #define COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 32 matching lines @@
     virtual ~ToolkitDelegate() {}
     // Initialize the toolkit's menu.
     virtual void Init(ui::SimpleMenuModel* menu_model) = 0;
 
     virtual void Cancel() = 0;
 
     // Updates the actual menu items controlled by the toolkit.
     virtual void UpdateMenuItem(int command_id,
                                 bool enabled,
                                 bool hidden,
-                                const base::string16& title) = 0;
+                                const base::string16& title,
+                                gfx::Image* icon) = 0;
   };
 
   static const size_t kMaxSelectionTextLength;
 
   static void SetContentCustomCommandIdRange(int first, int last);
 
   // Convert a command ID so that it fits within the range for
   // content context menu.
   static int ConvertToContentCustomCommandId(int id);
 
@@ skipping 32 matching lines @@
   // RenderViewContextMenuProxy implementation.
   void AddMenuItem(int command_id, const base::string16& title) override;
   void AddCheckItem(int command_id, const base::string16& title) override;
   void AddSeparator() override;
   void AddSubMenu(int command_id,
                   const base::string16& label,
                   ui::MenuModel* model) override;
   void UpdateMenuItem(int command_id,
                       bool enabled,
                       bool hidden,
-                      const base::string16& title) override;
+                      const base::string16& title,
+                      gfx::Image* icon) override;
   content::RenderViewHost* GetRenderViewHost() const override;
   content::WebContents* GetWebContents() const override;
   content::BrowserContext* GetBrowserContext() const override;
 
  protected:
   friend class RenderViewContextMenuTest;
   friend class RenderViewContextMenuPrefsTest;
 
   void set_content_type(ContextMenuContentType* content_type) {
     content_type_.reset(content_type);
@@ skipping 57 matching lines @@
   mutable ObserverList<RenderViewContextMenuObserver> observers_;
 
   // Whether a command has been executed. Used to track whether menu observers
   // should be notified of menu closing without execution.
   bool command_executed_;
 
   scoped_ptr<ContextMenuContentType> content_type_;
 
  private:
   bool AppendCustomItems();
+  void AddCustomItemsToMenu(const std::vector<content::MenuItem>& items,
+                            size_t depth,
+                            size_t* total_items,
+                            ui::SimpleMenuModel::Delegate* delegate,
+                            ui::SimpleMenuModel* menu_model);
+  void OnIconDownloaded(int id,
+                        int http_status_code,
+                        const GURL& image_url,
+                        const std::vector<SkBitmap>& bitmaps,
+                        const std::vector<gfx::Size>& original_bitmap_sizes);
 
+  typedef std::map<int, content::MenuItem> IconMap;
+  IconMap icon_map_;
   // The RenderFrameHost's IDs.
   int render_process_id_;
 
   scoped_ptr<ToolkitDelegate> toolkit_delegate_;
+  base::WeakPtrFactory<RenderViewContextMenuBase> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenuBase);
 };
 
 #endif  // COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_