Merge 34812 - Add the rightclick context menu for Browser actions and Page...

chrome/browser/extensions/extensions_ui.cc

Index: chrome/browser/extensions/extensions_ui.cc
===================================================================
--- chrome/browser/extensions/extensions_ui.cc	(revision 35008)
+++ chrome/browser/extensions/extensions_ui.cc	(working copy)
@@ -403,10 +403,9 @@
   if (!extension)
     return;
 
-  FilePath icon_path =
-      extension->GetIconPath(Extension::EXTENSION_ICON_LARGE).GetFilePath();
   scoped_ptr<SkBitmap> uninstall_icon;
-  CrxInstaller::DecodeInstallIcon(icon_path, &uninstall_icon);
+  Extension::DecodeIcon(extension, Extension::EXTENSION_ICON_LARGE,
+                        &uninstall_icon);
 
   extension_id_uninstalling_ = extension_id;
   ExtensionInstallUI client(dom_ui_->GetProfile());