diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 20:57:26 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 20:57:26 +0000 |
| commit | d2aa06b4b5f2be4a76a895e3c6e4e041218af42a (patch) | |
| tree | 810ef408dad702eb5f0c59f125e2cd31e81df7a6 /chrome/browser/extensions/extension_event_router.cc | |
| parent | cfb09c2d58ecb16b14192619695ea54570344ca7 (diff) | |
| download | chromium_src-d2aa06b4b5f2be4a76a895e3c6e4e041218af42a.zip chromium_src-d2aa06b4b5f2be4a76a895e3c6e4e041218af42a.tar.gz chromium_src-d2aa06b4b5f2be4a76a895e3c6e4e041218af42a.tar.bz2 | |
Keep lazy background pages open while they're being inspected.
Also add has_{lazy,persistent}_background_page helpers to Extension.
BUG=81752
TEST=Inspect a lazy background page; it should remain open until you close the inspector.
Review URL: https://chromiumcodereview.appspot.com/9768003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_event_router.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_event_router.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_event_router.cc b/chrome/browser/extensions/extension_event_router.cc index 673e86b..7c27f9a 100644 --- a/chrome/browser/extensions/extension_event_router.cc +++ b/chrome/browser/extensions/extension_event_router.cc @@ -403,8 +403,7 @@ void ExtensionEventRouter::MaybeLoadLazyBackgroundPage( bool ExtensionEventRouter::CanDispatchEventNow( Profile* profile, const Extension* extension) { DCHECK(extension); - if (extension->has_background_page() && - !extension->background_page_persists()) { + if (extension->has_lazy_background_page()) { ExtensionProcessManager* pm = profile->GetExtensionProcessManager(); ExtensionHost* background_host = pm->GetBackgroundHostForExtension(extension->id()); @@ -417,7 +416,7 @@ bool ExtensionEventRouter::CanDispatchEventNow( void ExtensionEventRouter::IncrementInFlightEvents( Profile* profile, const Extension* extension) { - if (!extension->background_page_persists()) { + if (extension->has_lazy_background_page()) { profile->GetExtensionProcessManager()->IncrementLazyKeepaliveCount( extension); } @@ -427,7 +426,7 @@ void ExtensionEventRouter::OnExtensionEventAck( Profile* profile, const std::string& extension_id) { const Extension* extension = profile->GetExtensionService()->extensions()->GetByID(extension_id); - if (extension && !extension->background_page_persists()) { + if (extension && extension->has_lazy_background_page()) { profile->GetExtensionProcessManager()->DecrementLazyKeepaliveCount( extension); } |