| 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 athena { | 12 namespace athena { |
| 13 class ActivityFactory; |
| 13 | 14 |
| 14 // Starts/shuts down the athena shell environment. | 15 // Starts/shuts down the athena shell environment. |
| 15 void StartAthena(aura::Window* root_window); | 16 void StartAthena(aura::Window* root_window, |
| 17 ActivityFactory* activity_factory); |
| 16 void ShutdownAthena(); | 18 void ShutdownAthena(); |
| 17 | 19 |
| 18 } // namespace athena | 20 } // namespace athena |
| 19 | 21 |
| 20 #endif // ATHENA_MAIN_ATHENA_LAUNCHER_H_ | 22 #endif // ATHENA_MAIN_ATHENA_LAUNCHER_H_ |
| OLD | NEW |