chrome/browser/ui/browser.cc - Issue 1376063005: Cleanup: Pull some browser keep alive functions into its own file.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/browser.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: more fixes 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

« chrome/browser/lifetime/browser_keep_alive.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc ('k') | chrome/browser/ui/panels/panel.h » ('j') | chrome/browser/ui/views/auto_keep_alive.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser.cc

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc

index 3cc7dac61f7490c3e6855e7bbf1bdc56e2d6e774..3ea33ad28dcf85f18373aa4d97bde3598d2fd505 100644

--- a/chrome/browser/ui/browser.cc

+++ b/chrome/browser/ui/browser.cc

@@ -61,6 +61,7 @@

#include "chrome/browser/history/top_sites_factory.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/lifetime/application_lifetime.h"

+#include "chrome/browser/lifetime/browser_keep_alive.h"

#include "chrome/browser/memory/tab_discard_state.h"

#include "chrome/browser/notifications/notification_ui_manager.h"

#include "chrome/browser/pepper_broker_infobar_delegate.h"

@@ -712,7 +713,7 @@ void Browser::OnWindowClosing() {

// AppController on the Mac, or BackgroundContentsService for background

// pages).

bool should_quit_if_last_browser =

- browser_shutdown::IsTryingToQuit() || !chrome::WillKeepAlive();

+ browser_shutdown::IsTryingToQuit() || !browser_lifetime::WillKeepAlive();

if (should_quit_if_last_browser && chrome::ShouldStartShutdown(this)) {

#if defined(OS_WIN)