chrome/browser/ui/apps/chrome_app_delegate.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/apps/chrome_app_delegate.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/apps/chrome_app_delegate.h ('k') | chrome/browser/ui/apps/chrome_app_window_client.cc » ('j') | chrome/browser/ui/views/auto_keep_alive.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/apps/chrome_app_delegate.cc

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

index 906cdeb6b0bf5d7e9c668cdb6b093c3573a9b353..b73f7b9139d6474c9d6277ffd0ea098ee3ba6ea6 100644

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

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

@@ -7,11 +7,11 @@

#include "base/memory/scoped_ptr.h"

#include "base/strings/stringprintf.h"

#include "chrome/browser/app_mode/app_mode_utils.h"

-#include "chrome/browser/apps/scoped_keep_alive.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"

#include "chrome/browser/favicon/favicon_utils.h"

#include "chrome/browser/file_select_helper.h"

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

#include "chrome/browser/media/media_capture_devices_dispatcher.h"

#include "chrome/browser/platform_util.h"

#include "chrome/browser/profiles/profile.h"

@@ -47,6 +47,8 @@

#endif // defined(ENABLE_PRINT_PREVIEW)

#endif // defined(ENABLE_PRINTING)

+using browser_lifetime::ScopedKeepAlive;

namespace {

// Time to wait for an app window to show before allowing Chrome to quit.