Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: athena/main/athena_launcher.cc

Issue 513523002: Adding Baseframework of the ResourceManager (all hooks and observers) are being put in place with a… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Self nits Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/content/public/app_registry.h" 9 #include "athena/content/public/app_registry.h"
10 #include "athena/content/public/content_activity_factory.h" 10 #include "athena/content/public/content_activity_factory.h"
11 #include "athena/content/public/content_app_model_builder.h" 11 #include "athena/content/public/content_app_model_builder.h"
12 #include "athena/home/public/home_card.h" 12 #include "athena/home/public/home_card.h"
13 #include "athena/home/public/home_card.h" 13 #include "athena/home/public/home_card.h"
14 #include "athena/input/public/input_manager.h" 14 #include "athena/input/public/input_manager.h"
15 #include "athena/main/debug/debug_window.h" 15 #include "athena/main/debug/debug_window.h"
16 #include "athena/main/placeholder.h" 16 #include "athena/main/placeholder.h"
17 #include "athena/main/placeholder.h" 17 #include "athena/main/placeholder.h"
18 #include "athena/main/url_search_provider.h" 18 #include "athena/main/url_search_provider.h"
19 #include "athena/resource_manager/public/resource_manager.h"
19 #include "athena/screen/public/screen_manager.h" 20 #include "athena/screen/public/screen_manager.h"
20 #include "athena/screen/public/screen_manager.h" 21 #include "athena/screen/public/screen_manager.h"
21 #include "athena/system/public/system_ui.h" 22 #include "athena/system/public/system_ui.h"
22 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" 23 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
23 #include "athena/wm/public/window_manager.h" 24 #include "athena/wm/public/window_manager.h"
24 #include "base/command_line.h" 25 #include "base/command_line.h"
25 #include "base/memory/scoped_ptr.h" 26 #include "base/memory/scoped_ptr.h"
26 #include "ui/app_list/app_list_switches.h" 27 #include "ui/app_list/app_list_switches.h"
27 #include "ui/aura/window_property.h" 28 #include "ui/aura/window_property.h"
28 #include "ui/keyboard/keyboard_controller.h" 29 #include "ui/keyboard/keyboard_controller.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 138
138 env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver); 139 env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver);
139 CreateTestPages(context); 140 CreateTestPages(context);
140 CreateDebugWindow(); 141 CreateDebugWindow();
141 } 142 }
142 143
143 void StartAthenaSession(athena::ActivityFactory* activity_factory, 144 void StartAthenaSession(athena::ActivityFactory* activity_factory,
144 athena::AppModelBuilder* app_model_builder) { 145 athena::AppModelBuilder* app_model_builder) {
145 athena::HomeCard::Create(app_model_builder); 146 athena::HomeCard::Create(app_model_builder);
146 athena::ActivityManager::Create(); 147 athena::ActivityManager::Create();
148 athena::ResourceManager::Create();
147 athena::ActivityFactory::RegisterActivityFactory(activity_factory); 149 athena::ActivityFactory::RegisterActivityFactory(activity_factory);
148 } 150 }
149 151
150 void ShutdownAthena() { 152 void ShutdownAthena() {
151 athena::ActivityFactory::Shutdown(); 153 athena::ActivityFactory::Shutdown();
154 athena::ResourceManager::Shutdown();
152 athena::ActivityManager::Shutdown(); 155 athena::ActivityManager::Shutdown();
153 athena::HomeCard::Shutdown(); 156 athena::HomeCard::Shutdown();
154 athena::AppRegistry::ShutDown(); 157 athena::AppRegistry::ShutDown();
155 athena::WindowManager::Shutdown(); 158 athena::WindowManager::Shutdown();
156 athena::ScreenManager::Shutdown(); 159 athena::ScreenManager::Shutdown();
157 athena::InputManager::Shutdown(); 160 athena::InputManager::Shutdown();
158 athena::SystemUI::Shutdown(); 161 athena::SystemUI::Shutdown();
159 162
160 delete views::ViewsDelegate::views_delegate; 163 delete views::ViewsDelegate::views_delegate;
161 } 164 }
162 165
163 } // namespace athena 166 } // namespace athena
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698