| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 athena::ScreenManager::Create(root_window); | 105 athena::ScreenManager::Create(root_window); |
| 106 athena::SystemUI::Create(file_runner); | 106 athena::SystemUI::Create(file_runner); |
| 107 athena::WindowManager::Create(); | 107 athena::WindowManager::Create(); |
| 108 athena::AppRegistry::Create(); | 108 athena::AppRegistry::Create(); |
| 109 SetupBackgroundImage(); | 109 SetupBackgroundImage(); |
| 110 | 110 |
| 111 athena::ScreenManager::Get()->GetContext()->SetProperty( | 111 athena::ScreenManager::Get()->GetContext()->SetProperty( |
| 112 kAthenaEnvStateKey, env_state); | 112 kAthenaEnvStateKey, env_state); |
| 113 } | 113 } |
| 114 | 114 |
| 115 void CreateVirtualKeyboardWithContext(content::BrowserContext* context) { |
| 116 athena::VirtualKeyboardManager::Create(context); |
| 117 } |
| 118 |
| 115 void StartAthenaSessionWithContext(content::BrowserContext* context) { | 119 void StartAthenaSessionWithContext(content::BrowserContext* context) { |
| 116 StartAthenaSession(athena::CreateContentActivityFactory(), | 120 StartAthenaSession(athena::CreateContentActivityFactory(), |
| 117 new athena::ExtensionAppModelBuilder(context)); | 121 new athena::ExtensionAppModelBuilder(context)); |
| 118 athena::VirtualKeyboardManager::Create(context); | |
| 119 athena::HomeCard::Get()->RegisterSearchProvider( | 122 athena::HomeCard::Get()->RegisterSearchProvider( |
| 120 new athena::UrlSearchProvider(context)); | 123 new athena::UrlSearchProvider(context)); |
| 121 AthenaEnvState* env_state = | 124 AthenaEnvState* env_state = |
| 122 athena::ScreenManager::Get()->GetContext()->GetProperty( | 125 athena::ScreenManager::Get()->GetContext()->GetProperty( |
| 123 kAthenaEnvStateKey); | 126 kAthenaEnvStateKey); |
| 124 | 127 |
| 125 env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver); | 128 env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver); |
| 126 CreateTestPages(context); | 129 CreateTestPages(context); |
| 127 } | 130 } |
| 128 | 131 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 144 athena::SystemUI::Shutdown(); | 147 athena::SystemUI::Shutdown(); |
| 145 athena::ScreenManager::Shutdown(); | 148 athena::ScreenManager::Shutdown(); |
| 146 athena::InputManager::Shutdown(); | 149 athena::InputManager::Shutdown(); |
| 147 athena::ExtensionsDelegate::Shutdown(); | 150 athena::ExtensionsDelegate::Shutdown(); |
| 148 athena::AthenaEnv::Shutdown(); | 151 athena::AthenaEnv::Shutdown(); |
| 149 | 152 |
| 150 delete views::ViewsDelegate::views_delegate; | 153 delete views::ViewsDelegate::views_delegate; |
| 151 } | 154 } |
| 152 | 155 |
| 153 } // namespace athena | 156 } // namespace athena |
| OLD | NEW |