From 0b9fca73321088d0457a9453ccebdae698f936ed Mon Sep 17 00:00:00 2001 From: "rafaelw@chromium.org" Date: Thu, 9 Jul 2009 00:03:46 +0000 Subject: ExtensionsServiceBackend::GarbageCollectionExtensions() makes a local copy of install_directory_. It was forcing the persistent copy to an absolute path which was causing the ExternsionsService and ExtensionsPrefs install_directory_ values to diverge. Re-enable ExternalInstallPref on mac. TBR=mpcomplete Review URL: http://codereview.chromium.org/155187 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20214 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extensions_service.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'chrome/browser/extensions/extensions_service.cc') diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc index b44c630..4094ebf 100644 --- a/chrome/browser/extensions/extensions_service.cc +++ b/chrome/browser/extensions/extensions_service.cc @@ -559,14 +559,15 @@ void ExtensionsServiceBackend::GarbageCollectExtensions( // Nothing to clean up if it doesn't exist. if (!file_util::DirectoryExists(install_directory_)) return; - - file_util::AbsolutePath(&install_directory_); + + FilePath install_directory_absolute(install_directory_); + file_util::AbsolutePath(&install_directory_absolute); LOG(INFO) << "Loading installed extensions..."; // Find all child directories in the install directory and load their // manifests. Post errors and results to the frontend. - file_util::FileEnumerator enumerator(install_directory_, + file_util::FileEnumerator enumerator(install_directory_absolute, false, // Not recursive. file_util::FileEnumerator::DIRECTORIES); FilePath extension_path; -- cgit v1.1