apps/shell/test/shell_test.cc - Issue 313733005: Introduces --app flag to athena to load an app.

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: apps/shell/test/shell_test.cc

Issue 313733005: Introduces --app flag to athena to load an app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 6 years, 6 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:

Index: apps/shell/test/shell_test.cc

diff --git a/apps/shell/test/shell_test.cc b/apps/shell/test/shell_test.cc

index 3d2cfeec0daa0bf37f647d6b85050fb5b34b4058..bdd19a7cf782dbf7f1209c768fd8d4ce63c962ac 100644

--- a/apps/shell/test/shell_test.cc

+++ b/apps/shell/test/shell_test.cc

@@ -47,7 +47,10 @@ void AppShellTest::RunTestOnMainThreadLoop() {

}

bool AppShellTest::LoadAndLaunchApp(const base::FilePath& app_dir) {

- return extension_system_->LoadAndLaunchApp(app_dir);

+ bool loaded = extension_system_->LoadApp(app_dir);

+ if (loaded)

+ extension_system_->LaunchApp();

+ return loaded;

}

} // namespace apps

« no previous file with comments | « apps/shell/browser/shell_extension_system.cc ('k') | athena/main/athena_main.cc » ('j') | no next file with comments »