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" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 | 62 |
63 views::ViewsDelegate::views_delegate = new AthenaViewsDelegate(); | 63 views::ViewsDelegate::views_delegate = new AthenaViewsDelegate(); |
64 | 64 |
65 RootWindowState* root_window_state = new RootWindowState; | 65 RootWindowState* root_window_state = new RootWindowState; |
66 root_window->SetProperty(kRootWindowStateKey, root_window_state); | 66 root_window->SetProperty(kRootWindowStateKey, root_window_state); |
67 | 67 |
68 root_window_state->visibility_client.reset(new ::wm::VisibilityController); | 68 root_window_state->visibility_client.reset(new ::wm::VisibilityController); |
69 aura::client::SetVisibilityClient(root_window, | 69 aura::client::SetVisibilityClient(root_window, |
70 root_window_state->visibility_client.get()); | 70 root_window_state->visibility_client.get()); |
71 | 71 |
72 athena::SystemUI::Create(); | |
73 athena::InputManager::Create()->OnRootWindowCreated(root_window); | 72 athena::InputManager::Create()->OnRootWindowCreated(root_window); |
74 athena::ScreenManager::Create(root_window); | 73 athena::ScreenManager::Create(root_window); |
| 74 athena::SystemUI::Create(); |
75 athena::WindowManager::Create(); | 75 athena::WindowManager::Create(); |
76 athena::HomeCard::Create(app_model_builder); | 76 athena::HomeCard::Create(app_model_builder); |
77 athena::ActivityManager::Create(); | 77 athena::ActivityManager::Create(); |
78 athena::ActivityFactory::RegisterActivityFactory(activity_factory); | 78 athena::ActivityFactory::RegisterActivityFactory(activity_factory); |
79 SetupBackgroundImage(); | 79 SetupBackgroundImage(); |
80 } | 80 } |
81 | 81 |
82 void ShutdownAthena() { | 82 void ShutdownAthena() { |
83 athena::ActivityFactory::Shutdown(); | 83 athena::ActivityFactory::Shutdown(); |
84 athena::ActivityManager::Shutdown(); | 84 athena::ActivityManager::Shutdown(); |
85 athena::HomeCard::Shutdown(); | 85 athena::HomeCard::Shutdown(); |
86 athena::WindowManager::Shutdown(); | 86 athena::WindowManager::Shutdown(); |
| 87 athena::SystemUI::Shutdown(); |
87 athena::ScreenManager::Shutdown(); | 88 athena::ScreenManager::Shutdown(); |
88 athena::InputManager::Shutdown(); | 89 athena::InputManager::Shutdown(); |
89 athena::SystemUI::Shutdown(); | |
90 | 90 |
91 delete views::ViewsDelegate::views_delegate; | 91 delete views::ViewsDelegate::views_delegate; |
92 } | 92 } |
93 | 93 |
94 } // namespace athena | 94 } // namespace athena |
OLD | NEW |