chrome/browser/ui/app_list/app_list_view_delegate.cc - Issue 557833007: Remove Increment/DecrementKeepAliveCount from AppsClient

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/app_list/app_list_view_delegate.cc

Issue 557833007: Remove Increment/DecrementKeepAliveCount from AppsClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Pass ScopedKeepAlive Created 6 years, 3 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/apps/scoped_keep_alive.h ('K') | « chrome/browser/ui/app_list/app_list_shower_views_unittest.cc ('k') | chrome/browser/ui/app_list/profile_loader.cc » ('j') | chrome/browser/ui/apps/chrome_app_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/app_list_view_delegate.cc

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

index af012b2907019a935f8a740d7c3db45874cb71fb..1ed2e7fde7798c1291ec7072a04fa838a9f35619 100644

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

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

@@ -12,6 +12,7 @@

#include "base/files/file_path.h"

#include "base/metrics/user_metrics.h"

#include "base/stl_util.h"

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

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

@@ -286,7 +287,8 @@ void AppListViewDelegate::SetUpCustomLauncherPages() {

std::string extension_id = it->host();

apps::CustomLauncherPageContents* page_contents =

new apps::CustomLauncherPageContents(

- scoped_ptr<extensions::AppDelegate>(new ChromeAppDelegate),

+ scoped_ptr<extensions::AppDelegate>(

+ new ChromeAppDelegate(scoped_ptr<ScopedKeepAlive>())),

extension_id);

page_contents->Initialize(profile_, *it);

custom_page_contents_.push_back(page_contents);