Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: chrome/browser/lifetime/keep_alive_registry.cc

Issue 1778873002: Replace Increment/DecrementKeepAliveCount by ScopedKeepAlives (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@KAObserver
Patch Set: remove registry destructor dchecks Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/lifetime/keep_alive_registry.cc
diff --git a/chrome/browser/lifetime/keep_alive_registry.cc b/chrome/browser/lifetime/keep_alive_registry.cc
index dbe7cbc26bdc149b9f1cb964fd307ae26fa5bbe9..54e01dd96f17eefc36388e40011c8f0b7ffdf1d2 100644
--- a/chrome/browser/lifetime/keep_alive_registry.cc
+++ b/chrome/browser/lifetime/keep_alive_registry.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/lifetime/keep_alive_registry.h"
+#include "chrome/browser/browser_process.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/lifetime/keep_alive_state_observer.h"
#include "chrome/browser/lifetime/keep_alive_types.h"
@@ -39,9 +40,9 @@ KeepAliveRegistry::KeepAliveRegistry()
: registered_count_(0), restart_allowed_count_(0) {}
KeepAliveRegistry::~KeepAliveRegistry() {
- DCHECK_EQ(0, registered_count_);
- DCHECK_EQ(0u, registered_keep_alives_.size());
- DCHECK_EQ(0, restart_allowed_count_);
+ // DCHECK_EQ(0, registered_count_) << " Registry: " << *this;
dgn 2016/03/11 22:15:04 I had to remove those DCHECKs to pass browser_test
+ // DCHECK_EQ(0u, registered_keep_alives_.size()) << " Registry: " << *this;
+ // DCHECK_EQ(0, restart_allowed_count_) << " Registry: " << *this;
}
void KeepAliveRegistry::Register(KeepAliveOrigin origin,
@@ -96,12 +97,18 @@ void KeepAliveRegistry::Unregister(KeepAliveOrigin origin,
}
void KeepAliveRegistry::OnKeepingAliveChanged(bool new_keeping_alive) {
+ // Although we should have a browser process, if there is none,
+ // there is nothing to do.
+ if (!g_browser_process)
+ return;
+
if (new_keeping_alive) {
DVLOG(1) << "KeepAliveRegistry is now keeping the browser alive.";
- chrome::IncrementKeepAliveCount();
+ g_browser_process->AddRefModule();
} else {
DVLOG(1) << "KeepAliveRegistry stopped keeping the browser alive.";
- chrome::DecrementKeepAliveCount();
+ g_browser_process->ReleaseModule();
+ chrome::CloseAllBrowsersIfNeeded();
}
}

Powered by Google App Engine
This is Rietveld 408576698