athena/main/athena_main.cc - Issue 501093003: Consolidate AppControllDelegate to ExtensionsDelegate

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: athena/main/athena_main.cc

Issue 501093003: Consolidate AppControllDelegate to ExtensionsDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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: athena/main/athena_main.cc

diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc

index b3d825efecccc5f1aef0aa507dc3ebeaa182b083..f003ba5707687604c9b666047ec802cb20c283b9 100644

--- a/athena/main/athena_main.cc

+++ b/athena/main/athena_main.cc

@@ -53,7 +53,8 @@ class AthenaDesktopController : public extensions::DesktopController {

extensions::ShellAppWindow* app_window = new extensions::ShellAppWindow();

app_window->Init(context, extension, gfx::Size(100, 100));

athena::ActivityManager::Get()->AddActivity(

- athena::ActivityFactory::Get()->CreateAppActivity(app_window));

+ athena::ActivityFactory::Get()->CreateAppActivity(app_window,

+ extension->id()));

return app_window;

}

« no previous file with comments | « athena/extensions/test/test_extensions_delegate.cc ('k') | athena/test/sample_activity_factory.h » ('j') | no next file with comments »