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/athena_launcher.h" | 5 #include "athena/main/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/home/public/home_card.h" | 9 #include "athena/home/public/home_card.h" |
10 #include "athena/input/public/input_manager.h" | 10 #include "athena/input/public/input_manager.h" |
11 #include "athena/main/placeholder.h" | 11 #include "athena/main/placeholder.h" |
12 #include "athena/screen/public/screen_manager.h" | 12 #include "athena/screen/public/screen_manager.h" |
13 #include "athena/system/public/system_ui.h" | 13 #include "athena/system/public/system_ui.h" |
14 #include "athena/wm/public/window_manager.h" | 14 #include "athena/wm/public/window_manager.h" |
15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 16 #include "content/public/browser/browser_thread.h" |
16 #include "ui/aura/window_property.h" | 17 #include "ui/aura/window_property.h" |
17 #include "ui/views/views_delegate.h" | 18 #include "ui/views/views_delegate.h" |
18 #include "ui/wm/core/visibility_controller.h" | 19 #include "ui/wm/core/visibility_controller.h" |
19 | 20 |
20 #if defined(USE_X11) | 21 #if defined(USE_X11) |
21 #include "ui/events/x/touch_factory_x11.h" | 22 #include "ui/events/x/touch_factory_x11.h" |
22 #endif | 23 #endif |
23 | 24 |
24 namespace athena { | 25 namespace athena { |
25 struct RootWindowState; | 26 struct RootWindowState; |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 | 63 |
63 views::ViewsDelegate::views_delegate = new AthenaViewsDelegate(); | 64 views::ViewsDelegate::views_delegate = new AthenaViewsDelegate(); |
64 | 65 |
65 RootWindowState* root_window_state = new RootWindowState; | 66 RootWindowState* root_window_state = new RootWindowState; |
66 root_window->SetProperty(kRootWindowStateKey, root_window_state); | 67 root_window->SetProperty(kRootWindowStateKey, root_window_state); |
67 | 68 |
68 root_window_state->visibility_client.reset(new ::wm::VisibilityController); | 69 root_window_state->visibility_client.reset(new ::wm::VisibilityController); |
69 aura::client::SetVisibilityClient(root_window, | 70 aura::client::SetVisibilityClient(root_window, |
70 root_window_state->visibility_client.get()); | 71 root_window_state->visibility_client.get()); |
71 | 72 |
72 athena::SystemUI::Create(); | 73 athena::SystemUI::Create( |
| 74 content::BrowserThread::GetMessageLoopProxyForThread( |
| 75 content::BrowserThread::FILE)); |
73 athena::InputManager::Create()->OnRootWindowCreated(root_window); | 76 athena::InputManager::Create()->OnRootWindowCreated(root_window); |
74 athena::ScreenManager::Create(root_window); | 77 athena::ScreenManager::Create(root_window); |
75 athena::WindowManager::Create(); | 78 athena::WindowManager::Create(); |
76 athena::HomeCard::Create(app_model_builder); | 79 athena::HomeCard::Create(app_model_builder); |
77 athena::ActivityManager::Create(); | 80 athena::ActivityManager::Create(); |
78 athena::ActivityFactory::RegisterActivityFactory(activity_factory); | 81 athena::ActivityFactory::RegisterActivityFactory(activity_factory); |
79 SetupBackgroundImage(); | 82 SetupBackgroundImage(); |
80 } | 83 } |
81 | 84 |
82 void ShutdownAthena() { | 85 void ShutdownAthena() { |
83 athena::ActivityFactory::Shutdown(); | 86 athena::ActivityFactory::Shutdown(); |
84 athena::ActivityManager::Shutdown(); | 87 athena::ActivityManager::Shutdown(); |
85 athena::HomeCard::Shutdown(); | 88 athena::HomeCard::Shutdown(); |
86 athena::WindowManager::Shutdown(); | 89 athena::WindowManager::Shutdown(); |
87 athena::ScreenManager::Shutdown(); | 90 athena::ScreenManager::Shutdown(); |
88 athena::InputManager::Shutdown(); | 91 athena::InputManager::Shutdown(); |
89 athena::SystemUI::Shutdown(); | 92 athena::SystemUI::Shutdown(); |
90 | 93 |
91 delete views::ViewsDelegate::views_delegate; | 94 delete views::ViewsDelegate::views_delegate; |
92 } | 95 } |
93 | 96 |
94 } // namespace athena | 97 } // namespace athena |
OLD | NEW |