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_manager.h" |
7 #include "athena/home/public/home_card.h" | 8 #include "athena/home/public/home_card.h" |
8 #include "athena/main/placeholder.h" | 9 #include "athena/main/placeholder.h" |
9 #include "athena/screen/public/screen_manager.h" | 10 #include "athena/screen/public/screen_manager.h" |
10 #include "athena/wm/public/window_manager.h" | 11 #include "athena/wm/public/window_manager.h" |
11 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
12 #include "ui/aura/window_property.h" | 13 #include "ui/aura/window_property.h" |
13 #include "ui/wm/core/visibility_controller.h" | 14 #include "ui/wm/core/visibility_controller.h" |
14 | 15 |
15 namespace athena { | 16 namespace athena { |
16 struct RootWindowState; | 17 struct RootWindowState; |
(...skipping 16 matching lines...) Expand all Loading... |
33 RootWindowState* root_window_state = new RootWindowState; | 34 RootWindowState* root_window_state = new RootWindowState; |
34 root_window->SetProperty(kRootWindowStateKey, root_window_state); | 35 root_window->SetProperty(kRootWindowStateKey, root_window_state); |
35 | 36 |
36 root_window_state->visibility_client.reset(new ::wm::VisibilityController); | 37 root_window_state->visibility_client.reset(new ::wm::VisibilityController); |
37 aura::client::SetVisibilityClient(root_window, | 38 aura::client::SetVisibilityClient(root_window, |
38 root_window_state->visibility_client.get()); | 39 root_window_state->visibility_client.get()); |
39 | 40 |
40 athena::ScreenManager::Create(root_window); | 41 athena::ScreenManager::Create(root_window); |
41 athena::WindowManager::Create(); | 42 athena::WindowManager::Create(); |
42 athena::HomeCard::Create(); | 43 athena::HomeCard::Create(); |
| 44 athena::ActivityManager::Create(); |
43 | 45 |
44 SetupBackgroundImage(); | 46 SetupBackgroundImage(); |
45 } | 47 } |
46 | 48 |
47 void ShutdownAthena() { | 49 void ShutdownAthena() { |
| 50 athena::ActivityManager::Shutdown(); |
48 athena::HomeCard::Shutdown(); | 51 athena::HomeCard::Shutdown(); |
49 athena::WindowManager::Shutdown(); | 52 athena::WindowManager::Shutdown(); |
50 athena::ScreenManager::Shutdown(); | 53 athena::ScreenManager::Shutdown(); |
51 } | 54 } |
52 | 55 |
53 } // namespace athena | 56 } // namespace athena |
OLD | NEW |