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

Unified Diff: chrome/browser/ui/panels/panel.cc

Issue 1376063005: Cleanup: Pull some browser keep alive functions into its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 2 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
« no previous file with comments | « chrome/browser/ui/panels/panel.h ('k') | chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel.cc
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc
index 56618ba689a3b5aaf4687bd3d216f4bfd6cc4881..3562f6380e06da03056528b6d1ac8fa815337931 100644
--- a/chrome/browser/ui/panels/panel.cc
+++ b/chrome/browser/ui/panels/panel.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/extensions/window_controller.h"
#include "chrome/browser/extensions/window_controller_list.h"
#include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/lifetime/browser_keep_alive.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/task_management/web_contents_tags.h"
@@ -160,7 +161,7 @@ Panel::~Panel() {
DCHECK(!collection_);
#if !defined(USE_AURA)
// Invoked by native panel destructor. Do not access native_panel_ here.
- chrome::DecrementKeepAliveCount(); // Remove shutdown prevention.
+ keep_alive_.reset(); // Remove shutdown prevention.
#endif
}
@@ -552,7 +553,7 @@ void Panel::Initialize(const GURL& url,
#if !defined(USE_AURA)
// Keep alive for AURA has been moved to panel_view.
// Prevent the browser process from shutting down while this window is open.
- chrome::IncrementKeepAliveCount();
+ keep_alive_.reset(new browser_lifetime::ScopedKeepAlive);
#endif
UpdateAppIcon();
« no previous file with comments | « chrome/browser/ui/panels/panel.h ('k') | chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698