Eliminate all UI thread decoding of extension images....

chrome/browser/extensions/extensions_ui.cc

-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/base64.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 353 matching lines @@
   std::map<int, std::string>::const_iterator iter =
       icons.find(Extension::EXTENSION_ICON_MEDIUM);
   if (iter == icons.end())
     iter = icons.find(Extension::EXTENSION_ICON_LARGE);
   if (iter != icons.end())
     return extension->GetResource(iter->second);
   else
     return ExtensionResource();
 }
 
+ExtensionInstallUI* ExtensionsDOMHandler::GetExtensionInstallUI() {
+  if (!install_ui_.get())
+    install_ui_.reset(new ExtensionInstallUI(dom_ui_->GetProfile()));
+  return install_ui_.get();
+}
+
 void ExtensionsDOMHandler::HandleToggleDeveloperMode(const Value* value) {
   bool developer_mode = dom_ui_->GetProfile()->GetPrefs()
       ->GetBoolean(prefs::kExtensionsUIDeveloperMode);
   dom_ui_->GetProfile()->GetPrefs()->SetBoolean(
       prefs::kExtensionsUIDeveloperMode, !developer_mode);
 }
 
 void ExtensionsDOMHandler::HandleInspectMessage(const Value* value) {
   std::string render_process_id_str;
   std::string render_view_id_str;
@@ skipping 56 matching lines @@
   CHECK(list->GetString(1, &enable_str));
   Extension* extension = extensions_service_->GetExtensionById(extension_id,
                                                                true);
   DCHECK(extension);
 
   if (enable_str == "true") {
     if (!extension_id_prompting_.empty())
       return;  // only one prompt at a time
 
     // Prompt the user first.
-    scoped_ptr<SkBitmap> icon;
-    Extension::DecodeIcon(extension, Extension::EXTENSION_ICON_LARGE, &icon);
-
     ui_prompt_type_ = ExtensionInstallUI::ENABLE_INCOGNITO_PROMPT;
     extension_id_prompting_ = extension_id;
-    ExtensionInstallUI client(dom_ui_->GetProfile());
-    client.ConfirmEnableIncognito(this, extension, icon.get());
+
+    GetExtensionInstallUI()->ConfirmEnableIncognito(this, extension);
   } else {
     extensions_service_->SetIsIncognitoEnabled(extension, false);
   }
 }
 
 void ExtensionsDOMHandler::HandleUninstallMessage(const Value* value) {
   CHECK(value->IsType(Value::TYPE_LIST));
   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;
 
   if (!extension_id_prompting_.empty())
     return;  // only one prompt at a time
 
-  scoped_ptr<SkBitmap> uninstall_icon;
-  Extension::DecodeIcon(extension, Extension::EXTENSION_ICON_LARGE,
-                        &uninstall_icon);
-
   ui_prompt_type_ = ExtensionInstallUI::UNINSTALL_PROMPT;
   extension_id_prompting_ = extension_id;
-  ExtensionInstallUI client(dom_ui_->GetProfile());
-  client.ConfirmUninstall(this, extension, uninstall_icon.get());
+
+  GetExtensionInstallUI()->ConfirmUninstall(this, extension);
 }
 
 void ExtensionsDOMHandler::InstallUIProceed(bool create_app_shortcut) {
   // We only ever use ExtensionInstallUI for uninstalling, which should never
   // result in it telling us to create a shortcut.
   DCHECK(!create_app_shortcut);
 
   // The extension can be uninstalled in another window while the UI was
   // showing. Do nothing in that case.
   Extension* extension =
@@ skipping 357 matching lines @@
 // static
 RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_PLUGIN);
 }
 
 // static
 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, false);
 }