Allow extension overinstall

chrome/browser/extensions/crx_installer.cc

 // 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/crx_installer.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.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_error_reporter.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.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);
   }
 }
 
@@ skipping 169 matching lines @@
                   NotificationService::NoDetails());
   Release();  // balanced in ConfirmInstall().
 
   // We're done. Since we don't post any more tasks to ourself, our ref count
   // should go to zero and we die. The destructor will clean up the temp dir.
 }
 
 void CrxInstaller::CompleteInstall() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
 
-  FilePath version_dir;
-  Extension::InstallType install_type =
-      extension_file_util::CompareToInstalledVersion(
-          install_directory_, extension_->id(), current_version_,
-          extension_->VersionString(), &version_dir);
+  if (!current_version_.empty()) {
+    scoped_ptr<Version> current_version(
+        Version::GetVersionFromString(current_version_));
+    if (current_version->CompareTo(*(extension_->version())) > 0) {
+      ReportFailureFromFileThread("Attempted to downgrade extension.");
+      return;
+    }
+  }
 
-  if (install_type == Extension::DOWNGRADE) {
-    ReportFailureFromFileThread("Attempted to downgrade extension.");
+  FilePath version_dir = extension_file_util::InstallExtension(
+      unpacked_extension_root_,
+      extension_->id(),
+      extension_->VersionString(),
+      install_directory_);
+  if (version_dir.empty()) {
+    ReportFailureFromFileThread(
+        l10n_util::GetStringUTF8(
+            IDS_EXTENSION_MOVE_DIRECTORY_TO_PROFILE_FAILED));
     return;
   }
 
-  if (install_type == Extension::REINSTALL) {
-    // We use this as a signal to switch themes.
-    ReportOverinstallFromFileThread();
-    return;
-  }
-
-  std::string error_msg;
-  if (!extension_file_util::InstallExtension(unpacked_extension_root_,
-                                             version_dir, &error_msg)) {
-    ReportFailureFromFileThread(error_msg);
-    return;
-  }
-
   if (create_app_shortcut_) {
     SkBitmap icon = install_icon_.get() ? *install_icon_ :
         *ResourceBundle::GetSharedInstance().GetBitmapNamed(
             IDR_EXTENSION_DEFAULT_ICON);
 
     ShellIntegration::ShortcutInfo shortcut_info;
     shortcut_info.url = extension_->GetFullLaunchURL();
     shortcut_info.extension_id = UTF8ToUTF16(extension_->id());
     shortcut_info.title = UTF8ToUTF16(extension_->name());
     shortcut_info.description = UTF8ToUTF16(extension_->description());
@@ skipping 39 matching lines @@
   // see errors get reported via this interface.
   //
   // TODO(aa): Need to go through unit tests and clean them up too, probably get
   // rid of this line.
   ExtensionErrorReporter::GetInstance()->ReportError(error, false);  // quiet
 
   if (client_)
     client_->OnInstallFailure(error);
 }
 
-void CrxInstaller::ReportOverinstallFromFileThread() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
-  ChromeThread::PostTask(
-      ChromeThread::UI, FROM_HERE,
-      NewRunnableMethod(this, &CrxInstaller::ReportOverinstallFromUIThread));
-}
-
-void CrxInstaller::ReportOverinstallFromUIThread() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-
-  NotificationService* service = NotificationService::current();
-  service->Notify(NotificationType::EXTENSION_OVERINSTALL_ERROR,
-                  Source<CrxInstaller>(this),
-                  Details<const FilePath>(&extension_->path()));
-
-  if (client_)
-    client_->OnOverinstallAttempted(extension_.get());
-
-  frontend_->OnExtensionOverinstallAttempted(extension_->id());
-}
-
 void CrxInstaller::ReportSuccessFromFileThread() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(this, &CrxInstaller::ReportSuccessFromUIThread));
 }
 
 void CrxInstaller::ReportSuccessFromUIThread() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
   // If there is a client, tell the client about installation.
   if (client_)
     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.
 }