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/public/athena_launcher.h" | 5 #include "athena/main/public/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" |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 | 108 |
109 // Setup VisibilityClient | 109 // Setup VisibilityClient |
110 env_state->visibility_client.reset(new ::wm::VisibilityController); | 110 env_state->visibility_client.reset(new ::wm::VisibilityController); |
111 aura::Window* root_window = athena::AthenaEnv::Get()->GetHost()->window(); | 111 aura::Window* root_window = athena::AthenaEnv::Get()->GetHost()->window(); |
112 | 112 |
113 aura::client::SetVisibilityClient(root_window, | 113 aura::client::SetVisibilityClient(root_window, |
114 env_state->visibility_client.get()); | 114 env_state->visibility_client.get()); |
115 | 115 |
116 athena::InputManager::Create()->OnRootWindowCreated(root_window); | 116 athena::InputManager::Create()->OnRootWindowCreated(root_window); |
117 athena::ScreenManager::Create(root_window); | 117 athena::ScreenManager::Create(root_window); |
| 118 athena::WindowManager::Create(); |
118 athena::SystemUI::Create(blocking_task_runner); | 119 athena::SystemUI::Create(blocking_task_runner); |
119 athena::WindowManager::Create(); | |
120 athena::AppRegistry::Create(); | 120 athena::AppRegistry::Create(); |
121 SetupBackgroundImage(); | 121 SetupBackgroundImage(); |
122 | 122 |
123 athena::ScreenManager::Get()->GetContext()->SetProperty( | 123 athena::ScreenManager::Get()->GetContext()->SetProperty( |
124 kAthenaEnvStateKey, env_state); | 124 kAthenaEnvStateKey, env_state); |
125 } | 125 } |
126 | 126 |
127 void CreateVirtualKeyboardWithContext(content::BrowserContext* context) { | 127 void CreateVirtualKeyboardWithContext(content::BrowserContext* context) { |
128 athena::VirtualKeyboardManager::Create(context); | 128 athena::VirtualKeyboardManager::Create(context); |
129 } | 129 } |
(...skipping 29 matching lines...) Expand all Loading... |
159 if (session_started) { | 159 if (session_started) { |
160 athena::ActivityFactory::Shutdown(); | 160 athena::ActivityFactory::Shutdown(); |
161 athena::ResourceManager::Shutdown(); | 161 athena::ResourceManager::Shutdown(); |
162 athena::ActivityManager::Shutdown(); | 162 athena::ActivityManager::Shutdown(); |
163 athena::HomeCard::Shutdown(); | 163 athena::HomeCard::Shutdown(); |
164 athena::ExtensionsDelegate::Shutdown(); | 164 athena::ExtensionsDelegate::Shutdown(); |
165 athena::ScreenLockManager::Shutdown(); | 165 athena::ScreenLockManager::Shutdown(); |
166 session_started = false; | 166 session_started = false; |
167 } | 167 } |
168 athena::AppRegistry::ShutDown(); | 168 athena::AppRegistry::ShutDown(); |
| 169 athena::SystemUI::Shutdown(); |
169 athena::WindowManager::Shutdown(); | 170 athena::WindowManager::Shutdown(); |
170 athena::SystemUI::Shutdown(); | |
171 athena::ScreenManager::Shutdown(); | 171 athena::ScreenManager::Shutdown(); |
172 athena::InputManager::Shutdown(); | 172 athena::InputManager::Shutdown(); |
173 athena::AthenaEnv::Shutdown(); | 173 athena::AthenaEnv::Shutdown(); |
174 | 174 |
175 ShutdownAthenaViewsDelegate(); | 175 ShutdownAthenaViewsDelegate(); |
176 } | 176 } |
177 | 177 |
178 } // namespace athena | 178 } // namespace athena |
OLD | NEW |