| Index: athena/main/athena_launcher.h
|
| diff --git a/athena/main/athena_launcher.h b/athena/main/athena_launcher.h
|
| index 6ea439fcdb5a73d99ac26910c0302a8b52a3df62..80699279b3fa3f0ae2e2f22b807e7fe52563bfc7 100644
|
| --- a/athena/main/athena_launcher.h
|
| +++ b/athena/main/athena_launcher.h
|
| @@ -9,14 +9,23 @@ namespace aura {
|
| class Window;
|
| }
|
|
|
| +namespace content {
|
| +class BrowserContext;
|
| +}
|
| +
|
| namespace athena {
|
| class ActivityFactory;
|
| class AppModelBuilder;
|
|
|
| // Starts/shuts down the athena shell environment.
|
| -void StartAthena(aura::Window* root_window,
|
| - ActivityFactory* activity_factory,
|
| - AppModelBuilder* app_model_builder);
|
| +void StartAthenaEnv(aura::Window* root_window);
|
| +
|
| +void StartAthenaSessionWithContext(content::BrowserContext* context);
|
| +
|
| +// Starts/shuts down the athena shell environment.
|
| +void StartAthenaSession(ActivityFactory* activity_factory,
|
| + AppModelBuilder* app_model_builder);
|
| +
|
| void ShutdownAthena();
|
|
|
| } // namespace athena
|
|
|