Index: chrome/common/extensions/extension.h |
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h |
index cf6a3fde07af6bbc62643ad51241a71f429070fe..ea492c2bd31bb50bf06ce465c3ebb2bde05470ee 100644 |
--- a/chrome/common/extensions/extension.h |
+++ b/chrome/common/extensions/extension.h |
@@ -572,12 +572,14 @@ class Extension : public base::RefCountedThreadSafe<Extension> { |
const std::vector<std::string>& background_scripts() const { |
return background_scripts_; |
} |
- bool background_page_persists() const { return background_page_persists_; } |
+ bool background_page_is_transient() const { |
+ return background_page_is_transient_; |
+ } |
bool has_persistent_background_page() const { |
- return has_background_page() && background_page_persists(); |
+ return has_background_page() && !background_page_is_transient(); |
} |
bool has_lazy_background_page() const { |
- return has_background_page() && !background_page_persists(); |
+ return has_background_page() && background_page_is_transient(); |
} |
const GURL& options_url() const { return options_url_; } |
const GURL& devtools_url() const { return devtools_url_; } |
@@ -743,7 +745,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> { |
bool LoadBackgroundScripts(string16* error); |
bool LoadBackgroundPage(const ExtensionAPIPermissionSet& api_permissions, |
string16* error); |
- bool LoadBackgroundPersistent( |
+ bool LoadBackgroundTransient( |
const ExtensionAPIPermissionSet& api_permissions, |
string16* error); |
bool LoadBackgroundAllowJSAccess( |
@@ -927,9 +929,9 @@ class Extension : public base::RefCountedThreadSafe<Extension> { |
// present, background_url_ will be empty and generated by GetBackgroundURL(). |
std::vector<std::string> background_scripts_; |
- // True if the background page should stay loaded forever; false if it should |
- // load on-demand (when it needs to handle an event). Defaults to true. |
- bool background_page_persists_; |
+ // False if the background page should stay loaded forever; true if it should |
+ // load on-demand (when it needs to handle an event). Defaults to false. |
+ bool background_page_is_transient_; |
// True if the background page can be scripted by pages of the app or |
// extension, in which case all such pages must run in the same process. |