chrome/browser/ui/ash/ash_init.cc - Issue 1778873002: Replace Increment/DecrementKeepAliveCount by ScopedKeepAlives

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 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

« chrome/browser/lifetime/keep_alive_registry.cc ('K') | « chrome/browser/ui/app_list/app_list_service_views_browsertest.cc ('k') | chrome/browser/ui/browser.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 007c7f5b2acaa1373dcb470f7a026f9d5f3f28bd..db3fad2aa3425ae0850758bf8cd4499d7f686240 100644

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

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

@@ -26,6 +26,8 @@

#if defined(OS_CHROMEOS)

#include "base/sys_info.h"

+#include "chrome/browser/browser_process.h"

+#include "chrome/browser/browser_process_platform_part.h"

#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

#include "chrome/browser/chromeos/accessibility/magnification_manager.h"

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

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

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

switches::kDisableZeroBrowsersOpenForTests)) {

- chrome::IncrementKeepAliveCount();

+ g_browser_process->platform_part()->RegisterKeepAlive();

}

#endif

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