Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(563)

Issues Search
    My Issues | Starred     Open | Closed | All

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
« athena/extensions/shell/extensions_delegate_impl.cc ('K') | « athena/extensions/test/test_extensions_delegate.cc ('k') | athena/test/sample_activity_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« athena/extensions/shell/extensions_delegate_impl.cc ('K') | « athena/extensions/test/test_extensions_delegate.cc ('k') | athena/test/sample_activity_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698