chrome/browser/ui/ash/ash_init.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/ash/ash_init.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/apps/chrome_app_window_client.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/ash_init.cc

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

index ccbe576a7a5210057e2e58499aa6f278e59d93e7..bde28c229b43d9aabb053d31b3a2da349fee75ed 100644

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

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

@@ -14,6 +14,7 @@

#include "base/command_line.h"

#include "chrome/browser/browser_shutdown.h"

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

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

#include "chrome/browser/ui/ash/chrome_screenshot_grabber.h"

#include "chrome/browser/ui/ash/chrome_shell_content_state.h"

#include "chrome/browser/ui/ash/chrome_shell_delegate.h"

@@ -92,7 +93,7 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {

if (!base::CommandLine::ForCurrentProcess()->HasSwitch(

switches::kDisableZeroBrowsersOpenForTests)) {

- chrome::IncrementKeepAliveCount();

+ browser_lifetime::IncrementKeepAliveCount();

}

#endif

ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();