Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: chrome/browser/extensions/webstore_standalone_installer.cc

Issue 1497193002: Remove all the ephemeral apps code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Self review, Devlin review. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/webstore_standalone_installer.cc
diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc
index 760cb00eb281ea0a003aa3204c8fe4e7cd83727c..84565c91d2f36ff9bd1a209a9ea5599a25c46c46 100644
--- a/chrome/browser/extensions/webstore_standalone_installer.cc
+++ b/chrome/browser/extensions/webstore_standalone_installer.cc
@@ -18,7 +18,6 @@
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
-#include "extensions/browser/extension_util.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_urls.h"
#include "url/gurl.h"
@@ -209,28 +208,6 @@ void WebstoreStandaloneInstaller::InstallUIProceed() {
// Don't install a blacklisted extension.
install_result = webstore_install::BLACKLISTED;
install_message = kExtensionIsBlacklisted;
- } 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;
- }
-
- if (installed_extension->version()->CompareTo(
- *extension_to_install->version()) < 0) {
- // If the existing extension is out of date, proceed with the install
- // to update the extension.
- done = false;
- } else {
- install_ui::ShowPostInstallUIForApproval(
- profile_, *approval, installed_extension);
- extension_service->PromoteEphemeralApp(installed_extension, false);
- }
} else if (!extension_service->IsExtensionEnabled(id_)) {
// If the extension is installed but disabled, and not blacklisted,
// enable it.
« no previous file with comments | « chrome/browser/extensions/updater/extension_updater.cc ('k') | chrome/browser/extensions/zipfile_installer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698