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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/main/athena_launcher.h

Issue 311113005: AppModelBuilder to athena. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« athena/content/content_app_model_builder.cc ('K') | « athena/home/public/home_card.h ('k') | athena/main/athena_launcher.cc » ('j') | athena/test/sample_activity_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/athena_launcher.h
diff --git a/athena/main/athena_launcher.h b/athena/main/athena_launcher.h
index 4b36b6d71c14095a1e7769a7a71a66ae06fb9aa9..6ea439fcdb5a73d99ac26910c0302a8b52a3df62 100644
--- a/athena/main/athena_launcher.h
+++ b/athena/main/athena_launcher.h
@@ -11,10 +11,12 @@ class Window;
namespace athena {
class ActivityFactory;
+class AppModelBuilder;
// Starts/shuts down the athena shell environment.
void StartAthena(aura::Window* root_window,
- ActivityFactory* activity_factory);
+ ActivityFactory* activity_factory,
+ AppModelBuilder* app_model_builder);
void ShutdownAthena();
} // namespace athena
« athena/content/content_app_model_builder.cc ('K') | « athena/home/public/home_card.h ('k') | athena/main/athena_launcher.cc » ('j') | athena/test/sample_activity_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698