| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ATHENA_MAIN_ATHENA_LAUNCHER_H_ | 5 #ifndef ATHENA_MAIN_ATHENA_LAUNCHER_H_ |
| 6 #define ATHENA_MAIN_ATHENA_LAUNCHER_H_ | 6 #define ATHENA_MAIN_ATHENA_LAUNCHER_H_ |
| 7 | 7 |
| 8 namespace aura { | 8 namespace aura { |
| 9 class Window; | 9 class Window; |
| 10 } | 10 } |
| 11 | 11 |
| 12 namespace content { |
| 13 class BrowserContext; |
| 14 } |
| 15 |
| 12 namespace athena { | 16 namespace athena { |
| 13 class ActivityFactory; | 17 class ActivityFactory; |
| 14 class AppModelBuilder; | 18 class AppModelBuilder; |
| 15 | 19 |
| 16 // Starts/shuts down the athena shell environment. | 20 // Starts/shuts down the athena shell environment. |
| 17 void StartAthena(aura::Window* root_window, | 21 void StartAthenaEnv(aura::Window* root_window); |
| 18 ActivityFactory* activity_factory, | 22 |
| 19 AppModelBuilder* app_model_builder); | 23 void StartAthenaSessionWithContext(content::BrowserContext* context); |
| 24 |
| 25 // Starts/shuts down the athena shell environment. |
| 26 void StartAthenaSession(ActivityFactory* activity_factory, |
| 27 AppModelBuilder* app_model_builder); |
| 28 |
| 20 void ShutdownAthena(); | 29 void ShutdownAthena(); |
| 21 | 30 |
| 22 } // namespace athena | 31 } // namespace athena |
| 23 | 32 |
| 24 #endif // ATHENA_MAIN_ATHENA_LAUNCHER_H_ | 33 #endif // ATHENA_MAIN_ATHENA_LAUNCHER_H_ |
| OLD | NEW |