chrome/browser/ui/apps/chrome_app_window_client.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_window_client.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

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

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

index 9cf6b046cd21ac02a7846ab5de80b92908c6b0ae..94f0a108938ea66823ad339498c7fab2b0c9f8c0 100644

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

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

@@ -5,8 +5,8 @@

#include "chrome/browser/ui/apps/chrome_app_window_client.h"

#include "base/memory/singleton.h"

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

#include "chrome/browser/devtools/devtools_window.h"

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

#include "chrome/common/extensions/features/feature_channel.h"

#include "components/version_info/version_info.h"

#include "content/public/browser/devtools_agent_host.h"

@@ -39,8 +39,8 @@ extensions::AppWindow* ChromeAppWindowClient::CreateAppWindow(

return NULL;

#else

return new extensions::AppWindow(

- context,

- new ChromeAppDelegate(make_scoped_ptr(new ScopedKeepAlive)),

+ context, new ChromeAppDelegate(

+ make_scoped_ptr(new browser_lifetime::ScopedKeepAlive)),

extension);

#endif

}

« no previous file with comments | « chrome/browser/ui/apps/chrome_app_delegate.cc ('k') | chrome/browser/ui/ash/ash_init.cc » ('j') | no next file with comments »