| 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_PUBLIC_ATHENA_LAUNCHER_H_ | 5 #ifndef ATHENA_MAIN_PUBLIC_ATHENA_LAUNCHER_H_ |
| 6 #define ATHENA_MAIN_PUBLIC_ATHENA_LAUNCHER_H_ | 6 #define ATHENA_MAIN_PUBLIC_ATHENA_LAUNCHER_H_ |
| 7 | 7 |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "base/memory/scoped_ptr.h" |
| 9 | 10 |
| 10 namespace base { | 11 namespace base { |
| 11 class TaskRunner; | 12 class TaskRunner; |
| 12 } | 13 } |
| 13 | 14 |
| 14 namespace aura { | 15 namespace aura { |
| 15 class Window; | 16 class Window; |
| 16 } | 17 } |
| 17 | 18 |
| 18 namespace content { | 19 namespace content { |
| 19 class BrowserContext; | 20 class BrowserContext; |
| 20 } | 21 } |
| 21 | 22 |
| 22 namespace athena { | 23 namespace athena { |
| 23 class ActivityFactory; | 24 class ActivityFactory; |
| 24 class AppModelBuilder; | 25 class AppModelBuilder; |
| 26 class SearchControllerFactory; |
| 25 | 27 |
| 26 // Starts down the athena shell environment. | 28 // Starts down the athena shell environment. |
| 27 void StartAthenaEnv(scoped_refptr<base::TaskRunner> file_runner); | 29 void StartAthenaEnv(scoped_refptr<base::TaskRunner> file_runner); |
| 28 | 30 |
| 29 void StartAthenaSessionWithContext(content::BrowserContext* context); | 31 void StartAthenaSessionWithContext(content::BrowserContext* context); |
| 30 | 32 |
| 31 void CreateVirtualKeyboardWithContext(content::BrowserContext* context); | 33 void CreateVirtualKeyboardWithContext(content::BrowserContext* context); |
| 32 | 34 |
| 33 // Starts the athena session. | 35 // Starts the athena session. |
| 34 void StartAthenaSession(ActivityFactory* activity_factory, | 36 void StartAthenaSession(ActivityFactory* activity_factory, |
| 35 AppModelBuilder* app_model_builder); | 37 scoped_ptr<AppModelBuilder> app_model_builder, |
| 38 scoped_ptr<SearchControllerFactory> search_factory); |
| 36 | 39 |
| 37 void ShutdownAthena(); | 40 void ShutdownAthena(); |
| 38 | 41 |
| 39 } // namespace athena | 42 } // namespace athena |
| 40 | 43 |
| 41 #endif // ATHENA_MAIN_PUBLIC_ATHENA_LAUNCHER_H_ | 44 #endif // ATHENA_MAIN_PUBLIC_ATHENA_LAUNCHER_H_ |
| OLD | NEW |