chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc - Issue 1708343002: Add ScopedKeepAlive to c/b/lifetime

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 1708343002: Add ScopedKeepAlive to c/b/lifetime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove KeepAliveOrigin::TEST Created 4 years, 10 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

« no previous file with comments | « 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 4fe95ecc42c1ff49a05cf62066d944b521a4a96d..3281f89fc007dd8bfc1ebcb4f379bd421f720bed 100644

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

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

@@ -55,10 +55,10 @@

#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_chrome_user_manager.h"

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

#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"

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

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

#include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"

#include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"

@@ -746,10 +746,8 @@ class V1App : public TestBrowserWindow {

class V2App {

public:

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

- window_ = new extensions::AppWindow(

- profile,

- new ChromeAppDelegate(make_scoped_ptr(new ScopedKeepAlive)),

- extension);

+ window_ = new extensions::AppWindow(profile, new ChromeAppDelegate(true),

+ extension);

extensions::AppWindow::CreateParams params =

extensions::AppWindow::CreateParams();

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