| 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/activity/public/activity_factory.h" | 5 #include "athena/activity/public/activity_factory.h" |
| 6 #include "athena/activity/public/activity_manager.h" | 6 #include "athena/activity/public/activity_manager.h" |
| 7 #include "athena/content/public/web_contents_view_delegate_creator.h" | 7 #include "athena/content/public/web_contents_view_delegate_creator.h" |
| 8 #include "athena/env/public/athena_env.h" | 8 #include "athena/env/public/athena_env.h" |
| 9 #include "athena/extensions/public/extensions_delegate.h" | 9 #include "athena/extensions/public/extensions_delegate.h" |
| 10 #include "athena/main/athena_content_client.h" | 10 #include "athena/main/athena_content_client.h" |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 if (base::DirectoryExists(app_absolute_dir)) { | 151 if (base::DirectoryExists(app_absolute_dir)) { |
| 152 extensions::ShellExtensionSystem* extension_system = | 152 extensions::ShellExtensionSystem* extension_system = |
| 153 static_cast<extensions::ShellExtensionSystem*>( | 153 static_cast<extensions::ShellExtensionSystem*>( |
| 154 extensions::ExtensionSystem::Get(context)); | 154 extensions::ExtensionSystem::Get(context)); |
| 155 extension_system->LoadApp(app_absolute_dir); | 155 extension_system->LoadApp(app_absolute_dir); |
| 156 } | 156 } |
| 157 | 157 |
| 158 athena::StartAthenaEnv(content::BrowserThread::GetMessageLoopProxyForThread( | 158 athena::StartAthenaEnv(content::BrowserThread::GetMessageLoopProxyForThread( |
| 159 content::BrowserThread::FILE)); | 159 content::BrowserThread::FILE)); |
| 160 athena::ExtensionsDelegate::CreateExtensionsDelegateForShell(context); | 160 athena::ExtensionsDelegate::CreateExtensionsDelegateForShell(context); |
| 161 athena::CreateVirtualKeyboardWithContext(context); |
| 161 athena::StartAthenaSessionWithContext(context); | 162 athena::StartAthenaSessionWithContext(context); |
| 162 } | 163 } |
| 163 | 164 |
| 164 virtual void Shutdown() OVERRIDE { | 165 virtual void Shutdown() OVERRIDE { |
| 165 athena::AthenaEnv::Get()->OnTerminating(); | 166 athena::AthenaEnv::Get()->OnTerminating(); |
| 166 athena::ShutdownAthena(); | 167 athena::ShutdownAthena(); |
| 167 } | 168 } |
| 168 | 169 |
| 169 virtual extensions::DesktopController* CreateDesktopController() OVERRIDE { | 170 virtual extensions::DesktopController* CreateDesktopController() OVERRIDE { |
| 170 return new AthenaDesktopController(); | 171 return new AthenaDesktopController(); |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 | 251 |
| 251 int main(int argc, const char** argv) { | 252 int main(int argc, const char** argv) { |
| 252 AthenaMainDelegate delegate; | 253 AthenaMainDelegate delegate; |
| 253 content::ContentMainParams params(&delegate); | 254 content::ContentMainParams params(&delegate); |
| 254 | 255 |
| 255 params.argc = argc; | 256 params.argc = argc; |
| 256 params.argv = argv; | 257 params.argv = argv; |
| 257 | 258 |
| 258 return content::ContentMain(params); | 259 return content::ContentMain(params); |
| 259 } | 260 } |
| OLD | NEW |