| 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 athena::ScreenManager::Create(root_window); | 122 athena::ScreenManager::Create(root_window); |
| 123 athena::SystemUI::Create(file_runner); | 123 athena::SystemUI::Create(file_runner); |
| 124 athena::WindowManager::Create(); | 124 athena::WindowManager::Create(); |
| 125 athena::AppRegistry::Create(); | 125 athena::AppRegistry::Create(); |
| 126 SetupBackgroundImage(); | 126 SetupBackgroundImage(); |
| 127 | 127 |
| 128 athena::ScreenManager::Get()->GetContext()->SetProperty( | 128 athena::ScreenManager::Get()->GetContext()->SetProperty( |
| 129 kAthenaEnvStateKey, env_state); | 129 kAthenaEnvStateKey, env_state); |
| 130 } | 130 } |
| 131 | 131 |
| 132 void CreateVirtualKeyboardWithContext(content::BrowserContext* context) { |
| 133 athena::VirtualKeyboardManager::Create(context); |
| 134 } |
| 135 |
| 132 void StartAthenaSessionWithContext(content::BrowserContext* context) { | 136 void StartAthenaSessionWithContext(content::BrowserContext* context) { |
| 133 StartAthenaSession(athena::CreateContentActivityFactory(), | 137 StartAthenaSession(athena::CreateContentActivityFactory(), |
| 134 new athena::ContentAppModelBuilder(context)); | 138 new athena::ContentAppModelBuilder(context)); |
| 135 athena::VirtualKeyboardManager::Create(context); | |
| 136 athena::HomeCard::Get()->RegisterSearchProvider( | 139 athena::HomeCard::Get()->RegisterSearchProvider( |
| 137 new athena::UrlSearchProvider(context)); | 140 new athena::UrlSearchProvider(context)); |
| 138 AthenaEnvState* env_state = | 141 AthenaEnvState* env_state = |
| 139 athena::ScreenManager::Get()->GetContext()->GetProperty( | 142 athena::ScreenManager::Get()->GetContext()->GetProperty( |
| 140 kAthenaEnvStateKey); | 143 kAthenaEnvStateKey); |
| 141 | 144 |
| 142 env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver); | 145 env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver); |
| 143 CreateTestPages(context); | 146 CreateTestPages(context); |
| 144 } | 147 } |
| 145 | 148 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 161 athena::SystemUI::Shutdown(); | 164 athena::SystemUI::Shutdown(); |
| 162 athena::ScreenManager::Shutdown(); | 165 athena::ScreenManager::Shutdown(); |
| 163 athena::InputManager::Shutdown(); | 166 athena::InputManager::Shutdown(); |
| 164 athena::ExtensionsDelegate::Shutdown(); | 167 athena::ExtensionsDelegate::Shutdown(); |
| 165 athena::AthenaEnv::Shutdown(); | 168 athena::AthenaEnv::Shutdown(); |
| 166 | 169 |
| 167 delete views::ViewsDelegate::views_delegate; | 170 delete views::ViewsDelegate::views_delegate; |
| 168 } | 171 } |
| 169 | 172 |
| 170 } // namespace athena | 173 } // namespace athena |
| OLD | NEW |