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/content_activity_factory.h" | 10 #include "athena/content/public/content_activity_factory.h" |
10 #include "athena/content/public/content_app_model_builder.h" | 11 #include "athena/content/public/content_app_model_builder.h" |
11 #include "athena/home/public/home_card.h" | 12 #include "athena/home/public/home_card.h" |
12 #include "athena/home/public/home_card.h" | 13 #include "athena/home/public/home_card.h" |
13 #include "athena/input/public/input_manager.h" | 14 #include "athena/input/public/input_manager.h" |
14 #include "athena/main/debug/debug_window.h" | 15 #include "athena/main/debug/debug_window.h" |
15 #include "athena/main/placeholder.h" | 16 #include "athena/main/placeholder.h" |
16 #include "athena/main/placeholder.h" | 17 #include "athena/main/placeholder.h" |
17 #include "athena/main/url_search_provider.h" | 18 #include "athena/main/url_search_provider.h" |
18 #include "athena/screen/public/screen_manager.h" | 19 #include "athena/screen/public/screen_manager.h" |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 // Setup VisibilityClient | 111 // Setup VisibilityClient |
111 env_state->visibility_client.reset(new ::wm::VisibilityController); | 112 env_state->visibility_client.reset(new ::wm::VisibilityController); |
112 | 113 |
113 aura::client::SetVisibilityClient(root_window, | 114 aura::client::SetVisibilityClient(root_window, |
114 env_state->visibility_client.get()); | 115 env_state->visibility_client.get()); |
115 | 116 |
116 athena::SystemUI::Create(file_runner); | 117 athena::SystemUI::Create(file_runner); |
117 athena::InputManager::Create()->OnRootWindowCreated(root_window); | 118 athena::InputManager::Create()->OnRootWindowCreated(root_window); |
118 athena::ScreenManager::Create(delegate, root_window); | 119 athena::ScreenManager::Create(delegate, root_window); |
119 athena::WindowManager::Create(); | 120 athena::WindowManager::Create(); |
| 121 athena::AppRegistry::Create(); |
120 SetupBackgroundImage(); | 122 SetupBackgroundImage(); |
121 | 123 |
122 athena::ScreenManager::Get()->GetContext()->SetProperty( | 124 athena::ScreenManager::Get()->GetContext()->SetProperty( |
123 kAthenaEnvStateKey, env_state); | 125 kAthenaEnvStateKey, env_state); |
124 } | 126 } |
125 | 127 |
126 void StartAthenaSessionWithContext(content::BrowserContext* context) { | 128 void StartAthenaSessionWithContext(content::BrowserContext* context) { |
127 StartAthenaSession(new athena::ContentActivityFactory(), | 129 StartAthenaSession(new athena::ContentActivityFactory(), |
128 new athena::ContentAppModelBuilder(context)); | 130 new athena::ContentAppModelBuilder(context)); |
129 athena::VirtualKeyboardManager::Create(context); | 131 athena::VirtualKeyboardManager::Create(context); |
(...skipping 12 matching lines...) Expand all Loading... |
142 athena::AppModelBuilder* app_model_builder) { | 144 athena::AppModelBuilder* app_model_builder) { |
143 athena::HomeCard::Create(app_model_builder); | 145 athena::HomeCard::Create(app_model_builder); |
144 athena::ActivityManager::Create(); | 146 athena::ActivityManager::Create(); |
145 athena::ActivityFactory::RegisterActivityFactory(activity_factory); | 147 athena::ActivityFactory::RegisterActivityFactory(activity_factory); |
146 } | 148 } |
147 | 149 |
148 void ShutdownAthena() { | 150 void ShutdownAthena() { |
149 athena::ActivityFactory::Shutdown(); | 151 athena::ActivityFactory::Shutdown(); |
150 athena::ActivityManager::Shutdown(); | 152 athena::ActivityManager::Shutdown(); |
151 athena::HomeCard::Shutdown(); | 153 athena::HomeCard::Shutdown(); |
| 154 athena::AppRegistry::ShutDown(); |
152 athena::WindowManager::Shutdown(); | 155 athena::WindowManager::Shutdown(); |
153 athena::ScreenManager::Shutdown(); | 156 athena::ScreenManager::Shutdown(); |
154 athena::InputManager::Shutdown(); | 157 athena::InputManager::Shutdown(); |
155 athena::SystemUI::Shutdown(); | 158 athena::SystemUI::Shutdown(); |
156 | 159 |
157 delete views::ViewsDelegate::views_delegate; | 160 delete views::ViewsDelegate::views_delegate; |
158 } | 161 } |
159 | 162 |
160 } // namespace athena | 163 } // namespace athena |
OLD | NEW |