diff options
| author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 23:21:10 +0000 |
|---|---|---|
| committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 23:21:10 +0000 |
| commit | f17dbd463d5066732782aacdb85432bf072fa597 (patch) | |
| tree | 0acf962efa7c0da39204640994934937c6fe74ee /chrome/browser/extensions/extensions_service.h | |
| parent | 402d7302df101e6a40ef3b9cc618e129a8a5ac67 (diff) | |
| download | chromium_src-f17dbd463d5066732782aacdb85432bf072fa597.zip chromium_src-f17dbd463d5066732782aacdb85432bf072fa597.tar.gz chromium_src-f17dbd463d5066732782aacdb85432bf072fa597.tar.bz2 | |
Upon a bad reload of an extension, leave the original disabled instead of blasting it away.
BUG=26888
TEST=TBD
Review URL: http://codereview.chromium.org/3106015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extensions_service.h')
| -rw-r--r-- | chrome/browser/extensions/extensions_service.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h index e5f15d2..25182ee 100644 --- a/chrome/browser/extensions/extensions_service.h +++ b/chrome/browser/extensions/extensions_service.h @@ -379,7 +379,7 @@ class ExtensionsService void UpdateActiveExtensionsInCrashReporter(); // Helper method. Loads extension from prefs. - void LoadInstalledExtension(const ExtensionInfo& info, bool relocalize); + void LoadInstalledExtension(const ExtensionInfo& info, bool write_to_prefs); // Helper methods to configure the storage services accordingly. void GrantUnlimitedStorage(Extension* extension); @@ -430,6 +430,12 @@ class ExtensionsService typedef std::map<std::string, FilePath> UnloadedExtensionPathMap; UnloadedExtensionPathMap unloaded_extension_paths_; + // Map disabled extensions' ids to their paths. When a temporarily loaded + // extension is disabled before it is reloaded, keep track of the path so that + // it can be re-enabled upon a successful load. + typedef std::map<std::string, FilePath> DisabledExtensionPathMap; + DisabledExtensionPathMap disabled_extension_paths_; + // Map of inspector cookies that are detached, waiting for an extension to be // reloaded. typedef std::map<std::string, int> OrphanedDevTools; |