Remove ability for users to launch ephemeral apps.

chrome/browser/extensions/webstore_standalone_installer.cc

 // Copyright (c) 2012 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/webstore_standalone_installer.h"
 
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
@@ skipping 17 matching lines @@
 namespace extensions {
 
 const char kInvalidWebstoreItemId[] = "Invalid Chrome Web Store item ID";
 const char kWebstoreRequestError[] =
     "Could not fetch data from the Chrome Web Store";
 const char kInvalidWebstoreResponseError[] = "Invalid Chrome Web Store reponse";
 const char kInvalidManifestError[] = "Invalid manifest";
 const char kUserCancelledError[] = "User cancelled install";
 const char kExtensionIsBlacklisted[] = "Extension is blacklisted";
 const char kInstallInProgressError[] = "An install is already in progress";
-const char kLaunchInProgressError[] = "A launch is already in progress";
 
 WebstoreStandaloneInstaller::WebstoreStandaloneInstaller(
     const std::string& webstore_item_id,
     Profile* profile,
     const Callback& callback)
     : id_(webstore_item_id),
       callback_(callback),
       profile_(profile),
       install_source_(WebstoreInstaller::INSTALL_SOURCE_INLINE),
       show_user_count_(true),
@@ skipping 55 matching lines @@
 
 bool WebstoreStandaloneInstaller::EnsureUniqueInstall(
     webstore_install::Result* reason,
     std::string* error) {
   InstallTracker* tracker = InstallTracker::Get(profile_);
   DCHECK(tracker);
 
   const ActiveInstallData* existing_install_data =
       tracker->GetActiveInstall(id_);
   if (existing_install_data) {
-    if (existing_install_data->is_ephemeral) {
-      *reason = webstore_install::LAUNCH_IN_PROGRESS;
-      *error = kLaunchInProgressError;
-    } else {
-      *reason = webstore_install::INSTALL_IN_PROGRESS;
-      *error = kInstallInProgressError;
-    }
+    *reason = webstore_install::INSTALL_IN_PROGRESS;
+    *error = kInstallInProgressError;
     return false;
   }
 
   ActiveInstallData install_data(id_);
   InitInstallData(&install_data);
   scoped_active_install_.reset(new ScopedActiveInstall(tracker, install_data));
   return true;
 }
 
 void WebstoreStandaloneInstaller::CompleteInstall(
@@ skipping 77 matching lines @@
       extension_service->GetExtensionById(id_, true /* include disabled */);
   if (installed_extension) {
     std::string install_message;
     webstore_install::Result install_result = webstore_install::SUCCESS;
     bool done = true;
 
     if (ExtensionPrefs::Get(profile_)->IsExtensionBlacklisted(id_)) {
       // Don't install a blacklisted extension.
       install_result = webstore_install::BLACKLISTED;
       install_message = kExtensionIsBlacklisted;
-    } else if (util::IsEphemeralApp(installed_extension->id(), profile_) &&
-               !approval->is_ephemeral) {
+    } else if (util::IsEphemeralApp(installed_extension->id(), profile_)) {
       // If the target extension has already been installed ephemerally and is
       // up to date, it can be promoted to a regular installed extension and
       // downloading from the Web Store is not necessary.
       scoped_refptr<const Extension> extension_to_install =
           GetLocalizedExtensionForDisplay();
       if (!extension_to_install.get()) {
         CompleteInstall(webstore_install::INVALID_MANIFEST,
                         kInvalidManifestError);
         return;
       }
@@ skipping 212 matching lines @@
 void WebstoreStandaloneInstaller::OnWebStoreDataFetcherDone() {
   // An instance of this class is passed in as a delegate for the
   // WebstoreInstallHelper, ExtensionInstallPrompt and WebstoreInstaller, and
   // therefore needs to remain alive until they are done. Clear the webstore
   // data fetcher to avoid calling Release in AbortInstall while any of these
   // operations are in progress.
   webstore_data_fetcher_.reset();
 }
 
 }  // namespace extensions