diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 00:03:46 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-09 00:03:46 +0000 |
| commit | 0b9fca73321088d0457a9453ccebdae698f936ed (patch) | |
| tree | 0d9cb9766d26625b5e670635af4d77de4958891e /chrome/browser/extensions/extensions_service.cc | |
| parent | eb77db7a3e96920392f37023f7a916715ed893e6 (diff) | |
| download | chromium_src-0b9fca73321088d0457a9453ccebdae698f936ed.zip chromium_src-0b9fca73321088d0457a9453ccebdae698f936ed.tar.gz chromium_src-0b9fca73321088d0457a9453ccebdae698f936ed.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/extensions/extensions_service.cc')
| -rw-r--r-- | chrome/browser/extensions/extensions_service.cc | 7 |
1 files changed, 4 insertions, 3 deletions
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; |