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

chrome/browser/extensions/extensions_ui.cc

 // Copyright (c) 2006-2009 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/extensions/extensions_ui.h"
 
 #include "app/gfx/codec/png_codec.h"
 #include "app/gfx/color_utils.h"
 #include "app/gfx/skbitmap_operations.h"
 #include "app/l10n_util.h"
@@ skipping 385 matching lines @@
   const ListValue* list = static_cast<const ListValue*>(value);
   CHECK(list->GetSize() == 1);
   std::string extension_id;
   CHECK(list->GetString(0, &extension_id));
 
   Extension *extension =
       extensions_service_->GetExtensionById(extension_id, true);
   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());
   client.ConfirmUninstall(this, extension, uninstall_icon.get());
 }
 
 void ExtensionsDOMHandler::InstallUIProceed() {
   extensions_service_->UninstallExtension(extension_id_uninstalling_, false);
   extension_id_uninstalling_ = "";
 }
@@ skipping 328 matching lines @@
 // static
 RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadImageResourceBytes(IDR_PLUGIN);
 }
 
 // static
 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, false);
 }