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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 extension_system->LoadApp(app_absolute_dir); | 98 extension_system->LoadApp(app_absolute_dir); |
99 } | 99 } |
100 | 100 |
101 athena::StartAthenaEnv(content::BrowserThread::GetMessageLoopProxyForThread( | 101 athena::StartAthenaEnv(content::BrowserThread::GetMessageLoopProxyForThread( |
102 content::BrowserThread::FILE)); | 102 content::BrowserThread::FILE)); |
103 athena::ExtensionsDelegate::CreateExtensionsDelegateForShell(context); | 103 athena::ExtensionsDelegate::CreateExtensionsDelegateForShell(context); |
104 athena::StartAthenaSessionWithContext(context); | 104 athena::StartAthenaSessionWithContext(context); |
105 } | 105 } |
106 | 106 |
107 virtual void Shutdown() OVERRIDE { | 107 virtual void Shutdown() OVERRIDE { |
| 108 athena::AthenaEnv::Get()->OnTerminating(); |
108 athena::ShutdownAthena(); | 109 athena::ShutdownAthena(); |
109 } | 110 } |
110 | 111 |
111 virtual extensions::DesktopController* CreateDesktopController() OVERRIDE { | 112 virtual extensions::DesktopController* CreateDesktopController() OVERRIDE { |
112 return new AthenaDesktopController(); | 113 return new AthenaDesktopController(); |
113 } | 114 } |
114 | 115 |
115 private: | 116 private: |
116 DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate); | 117 DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate); |
117 }; | 118 }; |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
188 | 189 |
189 int main(int argc, const char** argv) { | 190 int main(int argc, const char** argv) { |
190 AthenaMainDelegate delegate; | 191 AthenaMainDelegate delegate; |
191 content::ContentMainParams params(&delegate); | 192 content::ContentMainParams params(&delegate); |
192 | 193 |
193 params.argc = argc; | 194 params.argc = argc; |
194 params.argv = argv; | 195 params.argv = argv; |
195 | 196 |
196 return content::ContentMain(params); | 197 return content::ContentMain(params); |
197 } | 198 } |
OLD | NEW |