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

chrome/browser/extensions/crx_installer.cc

 // Copyright (c) 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/crx_installer.h"
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/extensions/convert_user_script.h"
 #include "chrome/browser/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_error_reporter.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "grit/chromium_strings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "webkit/glue/image_decoder.h"
 
 namespace {
   // Helper function to delete files. This is used to avoid ugly casts which
   // would be necessary with PostMessage since file_util::Delete is overloaded.
   static void DeleteFileHelper(const FilePath& path, bool recursive) {
     file_util::Delete(path, recursive);
   }
 }
 
 void CrxInstaller::Start(const FilePath& crx_path,
@@ skipping 111 matching lines @@
   // TODO(aa): Also support expected version?
   if (!expected_id_.empty() && expected_id_ != extension->id()) {
     ReportFailureFromFileThread(StringPrintf(
         "ID in new extension manifest (%s) does not match expected id (%s)",
         extension->id().c_str(),
         expected_id_.c_str()));
     return;
   }
 
   if (client_.get()) {
-    FilePath icon_path =
-        extension_->GetIconPath(Extension::EXTENSION_ICON_LARGE).GetFilePath();
-    DecodeInstallIcon(icon_path, &install_icon_);
+    Extension::DecodeIcon(extension_.get(), Extension::EXTENSION_ICON_LARGE,
+                          &install_icon_);
   }
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(this, &CrxInstaller::ConfirmInstall));
 }
 
-// static
-void CrxInstaller::DecodeInstallIcon(const FilePath& large_icon_path,
-                                     scoped_ptr<SkBitmap>* result) {
-  if (large_icon_path.empty())
-    return;
-
-  std::string file_contents;
-  if (!file_util::ReadFileToString(large_icon_path, &file_contents)) {
-    LOG(ERROR) << "Could not read icon file: "
-               << WideToUTF8(large_icon_path.ToWStringHack());
-    return;
-  }
-
-  // Decode the image using WebKit's image decoder.
-  const unsigned char* data =
-      reinterpret_cast<const unsigned char*>(file_contents.data());
-  webkit_glue::ImageDecoder decoder;
-  scoped_ptr<SkBitmap> decoded(new SkBitmap());
-  *decoded = decoder.Decode(data, file_contents.length());
-  if (decoded->empty()) {
-    LOG(ERROR) << "Could not decode icon file: "
-               << WideToUTF8(large_icon_path.ToWStringHack());
-    return;
-  }
-
-  if (decoded->width() != 128 || decoded->height() != 128) {
-    LOG(ERROR) << "Icon file has unexpected size: "
-               << IntToString(decoded->width()) << "x"
-               << IntToString(decoded->height());
-    return;
-  }
-
-  result->swap(decoded);
-}
-
 void CrxInstaller::ConfirmInstall() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   if (frontend_->extension_prefs()->IsExtensionBlacklisted(extension_->id())) {
     LOG(INFO) << "This extension: " << extension_->id()
       << " is blacklisted. Install failed.";
     ReportFailureFromUIThread("This extension is blacklisted.");
     return;
   }
 
   current_version_ =
@@ skipping 133 matching lines @@
     client_->OnInstallSuccess(extension_.get());
 
   // Tell the frontend about the installation and hand off ownership of
   // extension_ to it.
   frontend_->OnExtensionInstalled(extension_.release(),
                                   allow_privilege_increase_);
 
   // We're done. We don't post any more tasks to ourselves so we are deleted
   // soon.
 }