Install Chrome OS apps to shared location
This CL implements install and uninstall to shared location. New functionality
is disabled by default and can be enabled only by command line switch. The switch
will not be enabled until extensions resources verification is not enabled by
default in force mode for all apps/extensions.
Follow up CL should add support for GC in shared location.
BUG=235263
TEST=browser_tests + manual
[email protected]
[email protected]
Review URL: https://codereview.chromium.org/273193006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273620 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 726cff9..739f0a4 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -22,6 +22,7 @@
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/data_deleter.h"
+#include "chrome/browser/extensions/extension_assets_manager.h"
#include "chrome/browser/extensions/extension_disabled_ui.h"
#include "chrome/browser/extensions/extension_error_controller.h"
#include "chrome/browser/extensions/extension_install_ui.h"
@@ -749,9 +750,11 @@
if (!Manifest::IsUnpackedLocation(extension->location())) {
if (!GetFileTaskRunner()->PostTask(
FROM_HERE,
- base::Bind(&extensions::file_util::UninstallExtension,
+ base::Bind(&ExtensionService::UninstallExtensionOnFileThread,
+ extension->id(),
+ profile_,
install_directory_,
- extension->id())))
+ extension->path())))
NOTREACHED();
}
@@ -785,6 +788,17 @@
return true;
}
+// static
+void ExtensionService::UninstallExtensionOnFileThread(
+ const std::string& id,
+ Profile* profile,
+ const base::FilePath& install_dir,
+ const base::FilePath& extension_path) {
+ extensions::ExtensionAssetsManager* assets_manager =
+ extensions::ExtensionAssetsManager::GetInstance();
+ assets_manager->UninstallExtension(id, profile, install_dir, extension_path);
+}
+
bool ExtensionService::IsExtensionEnabled(
const std::string& extension_id) const {
if (registry_->enabled_extensions().Contains(extension_id) ||
