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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

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

index 05b367dee17143cddfd7979fe717ad6541ce6d2e..5636bf9176bfabc5b7dc197a16f7c6bcb6a91634 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

@@ -49,6 +49,7 @@

#if defined(OS_CHROMEOS)

#include "ash/test/test_session_state_delegate.h"

#include "ash/test/test_shell_delegate.h"

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

#include "chrome/browser/chromeos/login/users/fake_user_manager.h"

#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"

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

@@ -742,8 +743,9 @@ class V1App : public TestBrowserWindow {

class V2App {

public:

V2App(Profile* profile, const extensions::Extension* extension) {

- window_ = new extensions::AppWindow(profile, new ChromeAppDelegate(),

- extension);

+ window_ = new extensions::AppWindow(

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

tapted 2014/09/24 07:12:41 this should pass a KeepAlive too (also nit: 1 arg

hashimoto 2014/09/24 09:03:46 Done.

+ extension);

extensions::AppWindow::CreateParams params =

extensions::AppWindow::CreateParams();

window_->Init(GURL(std::string()),