Allow extension overinstall

chrome/browser/automation/automation_provider_observers.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/automation/automation_provider_observers.h"
 
 #include "base/basictypes.h"
 #include "base/json/json_writer.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 287 matching lines @@
 
 ExtensionInstallNotificationObserver::ExtensionInstallNotificationObserver(
     AutomationProvider* automation, int id, IPC::Message* reply_message)
     : automation_(automation),
       id_(id),
       reply_message_(reply_message) {
   registrar_.Add(this, NotificationType::EXTENSION_LOADED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_INSTALL_ERROR,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::EXTENSION_OVERINSTALL_ERROR,
-                 NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_UPDATE_DISABLED,
                  NotificationService::AllSources());
 }
 
 ExtensionInstallNotificationObserver::~ExtensionInstallNotificationObserver() {
 }
 
 void ExtensionInstallNotificationObserver::Observe(
     NotificationType type, const NotificationSource& source,
     const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::EXTENSION_LOADED:
       SendResponse(AUTOMATION_MSG_EXTENSION_INSTALL_SUCCEEDED);
       break;
     case NotificationType::EXTENSION_INSTALL_ERROR:
     case NotificationType::EXTENSION_UPDATE_DISABLED:
       SendResponse(AUTOMATION_MSG_EXTENSION_INSTALL_FAILED);
       break;
-    case NotificationType::EXTENSION_OVERINSTALL_ERROR:
-      SendResponse(AUTOMATION_MSG_EXTENSION_ALREADY_INSTALLED);
-      break;
     default:
       NOTREACHED();
       break;
   }
 
   delete this;
 }
 
 void ExtensionInstallNotificationObserver::SendResponse(
     AutomationMsg_ExtensionResponseValues response) {
@@ skipping 24 matching lines @@
       automation_(automation),
       id_(id),
       reply_message_(reply_message),
       extension_(NULL) {
   registrar_.Add(this, NotificationType::EXTENSION_HOST_DID_STOP_LOADING,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_LOADED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_INSTALL_ERROR,
                  NotificationService::AllSources());
-  registrar_.Add(this, NotificationType::EXTENSION_OVERINSTALL_ERROR,
-                 NotificationService::AllSources());
   registrar_.Add(this, NotificationType::EXTENSION_UPDATE_DISABLED,
                  NotificationService::AllSources());
 }
 
 ExtensionReadyNotificationObserver::~ExtensionReadyNotificationObserver() {
 }
 
 void ExtensionReadyNotificationObserver::Observe(
     NotificationType type, const NotificationSource& source,
     const NotificationDetails& details) {
   bool success = false;
   switch (type.value) {
     case NotificationType::EXTENSION_HOST_DID_STOP_LOADING:
       // Only continue on with this method if our extension has been loaded
       // and all the extension hosts have stopped loading.
       if (!extension_ || !DidExtensionHostsStopLoading(manager_))
         return;
       success = true;
       break;
     case NotificationType::EXTENSION_LOADED:
       extension_ = Details<Extension>(details).ptr();
       if (!DidExtensionHostsStopLoading(manager_))
         return;
       success = true;
       break;
     case NotificationType::EXTENSION_INSTALL_ERROR:
     case NotificationType::EXTENSION_UPDATE_DISABLED:
-    case NotificationType::EXTENSION_OVERINSTALL_ERROR:
       success = false;
       break;
     default:
       NOTREACHED();
       break;
   }
 
   if (id_ == AutomationMsg_InstallExtensionAndGetHandle::ID) {
     // A handle of zero indicates an error.
     int extension_handle = 0;
@@ skipping 580 matching lines @@
       type == NotificationType::AUTH_NEEDED) {
     AutomationMsg_SendJSONRequest::WriteReplyParams(
         reply_message_, std::string("{}"), false);
     automation_->Send(reply_message_);
     delete this;
   } else {
     NOTREACHED();
   }
 }