| 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 #include "athena/main/athena_launcher.h" | 5 #include "athena/main/athena_launcher.h" |
| 6 | 6 |
| 7 #include "athena/activity/public/activity_factory.h" | 7 #include "athena/activity/public/activity_factory.h" |
| 8 #include "athena/activity/public/activity_manager.h" | 8 #include "athena/activity/public/activity_manager.h" |
| 9 #include "athena/content/public/app_registry.h" | 9 #include "athena/content/public/app_registry.h" |
| 10 #include "athena/content/public/content_activity_factory_creator.h" | 10 #include "athena/content/public/content_activity_factory_creator.h" |
| 11 #include "athena/content/public/content_app_model_builder.h" | 11 #include "athena/content/public/content_app_model_builder.h" |
| 12 #include "athena/env/public/athena_env.h" | 12 #include "athena/env/public/athena_env.h" |
| 13 #include "athena/extensions/public/extensions_delegate.h" | 13 #include "athena/extensions/public/extensions_delegate.h" |
| 14 #include "athena/home/public/home_card.h" | 14 #include "athena/home/public/home_card.h" |
| 15 #include "athena/input/public/input_manager.h" | 15 #include "athena/input/public/input_manager.h" |
| 16 #include "athena/main/debug/debug_window.h" | 16 #include "athena/main/debug/debug_window.h" |
| 17 #include "athena/main/placeholder.h" | 17 #include "athena/main/placeholder.h" |
| 18 #include "athena/main/placeholder.h" | 18 #include "athena/main/placeholder.h" |
| 19 #include "athena/main/url_search_provider.h" | 19 #include "athena/main/url_search_provider.h" |
| 20 #include "athena/resource_manager/public/resource_manager.h" |
| 20 #include "athena/screen/public/screen_manager.h" | 21 #include "athena/screen/public/screen_manager.h" |
| 21 #include "athena/screen/public/screen_manager.h" | 22 #include "athena/screen/public/screen_manager.h" |
| 22 #include "athena/system/public/system_ui.h" | 23 #include "athena/system/public/system_ui.h" |
| 23 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" | 24 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" |
| 24 #include "athena/wm/public/window_manager.h" | 25 #include "athena/wm/public/window_manager.h" |
| 25 #include "base/command_line.h" | 26 #include "base/command_line.h" |
| 26 #include "base/memory/scoped_ptr.h" | 27 #include "base/memory/scoped_ptr.h" |
| 27 #include "ui/app_list/app_list_switches.h" | 28 #include "ui/app_list/app_list_switches.h" |
| 28 #include "ui/aura/window_property.h" | 29 #include "ui/aura/window_property.h" |
| 29 #include "ui/aura/window_tree_host.h" | 30 #include "ui/aura/window_tree_host.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 | 142 |
| 142 env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver); | 143 env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver); |
| 143 CreateTestPages(context); | 144 CreateTestPages(context); |
| 144 CreateDebugWindow(); | 145 CreateDebugWindow(); |
| 145 } | 146 } |
| 146 | 147 |
| 147 void StartAthenaSession(athena::ActivityFactory* activity_factory, | 148 void StartAthenaSession(athena::ActivityFactory* activity_factory, |
| 148 athena::AppModelBuilder* app_model_builder) { | 149 athena::AppModelBuilder* app_model_builder) { |
| 149 athena::HomeCard::Create(app_model_builder); | 150 athena::HomeCard::Create(app_model_builder); |
| 150 athena::ActivityManager::Create(); | 151 athena::ActivityManager::Create(); |
| 152 athena::ResourceManager::Create(); |
| 151 athena::ActivityFactory::RegisterActivityFactory(activity_factory); | 153 athena::ActivityFactory::RegisterActivityFactory(activity_factory); |
| 152 } | 154 } |
| 153 | 155 |
| 154 void ShutdownAthena() { | 156 void ShutdownAthena() { |
| 155 athena::ActivityFactory::Shutdown(); | 157 athena::ActivityFactory::Shutdown(); |
| 158 athena::ResourceManager::Shutdown(); |
| 156 athena::ActivityManager::Shutdown(); | 159 athena::ActivityManager::Shutdown(); |
| 157 athena::HomeCard::Shutdown(); | 160 athena::HomeCard::Shutdown(); |
| 158 athena::AppRegistry::ShutDown(); | 161 athena::AppRegistry::ShutDown(); |
| 159 athena::WindowManager::Shutdown(); | 162 athena::WindowManager::Shutdown(); |
| 160 athena::ScreenManager::Shutdown(); | 163 athena::ScreenManager::Shutdown(); |
| 161 athena::InputManager::Shutdown(); | 164 athena::InputManager::Shutdown(); |
| 162 athena::SystemUI::Shutdown(); | 165 athena::SystemUI::Shutdown(); |
| 163 athena::ExtensionsDelegate::Shutdown(); | 166 athena::ExtensionsDelegate::Shutdown(); |
| 164 athena::AthenaEnv::Shutdown(); | 167 athena::AthenaEnv::Shutdown(); |
| 165 | 168 |
| 166 delete views::ViewsDelegate::views_delegate; | 169 delete views::ViewsDelegate::views_delegate; |
| 167 } | 170 } |
| 168 | 171 |
| 169 } // namespace athena | 172 } // namespace athena |
| OLD | NEW |