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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/content/shell/content_activity_factory.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/content/app_activity.cc ('K') | « athena/content/public/app_registry.h ('k') | athena/content/shell/shell_app_activity.h » ('j') | athena/extensions/shell/extensions_delegate_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/shell/content_activity_factory.cc
diff --git a/athena/content/shell/content_activity_factory.cc b/athena/content/shell/content_activity_factory.cc
index c150f327d25fe9f32168b3f35b25678985fba3e6..538ca268b0a85cfe7b091a33a2036a297c3cbdd9 100644
--- a/athena/content/shell/content_activity_factory.cc
+++ b/athena/content/shell/content_activity_factory.cc
@@ -9,8 +9,9 @@
namespace athena {
Activity* ContentActivityFactory::CreateAppActivity(
- extensions::ShellAppWindow* app_window) {
- return new ShellAppActivity(app_window);
+ extensions::ShellAppWindow* app_window,
+ const std::string& app_id) {
+ return new ShellAppActivity(app_window, app_id);
}
Activity* ContentActivityFactory::CreateAppActivity(
« athena/content/app_activity.cc ('K') | « athena/content/public/app_registry.h ('k') | athena/content/shell/shell_app_activity.h » ('j') | athena/extensions/shell/extensions_delegate_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698