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/content/public/content_activity_factory.h" | 5 #include "athena/content/public/content_activity_factory.h" |
6 #include "athena/content/public/content_app_model_builder.h" | 6 #include "athena/content/public/content_app_model_builder.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/home/public/home_card.h" | 8 #include "athena/home/public/home_card.h" |
9 #include "athena/main/athena_app_window_controller.h" | 9 #include "athena/main/athena_app_window_controller.h" |
10 #include "athena/main/athena_launcher.h" | 10 #include "athena/main/athena_launcher.h" |
11 #include "athena/main/debug/debug_window.h" | |
12 #include "athena/main/placeholder.h" | 11 #include "athena/main/placeholder.h" |
13 #include "athena/main/url_search_provider.h" | 12 #include "athena/main/url_search_provider.h" |
14 #include "athena/screen/public/screen_manager.h" | 13 #include "athena/screen/public/screen_manager.h" |
15 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" | 14 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" |
16 #include "base/command_line.h" | 15 #include "base/command_line.h" |
17 #include "base/file_util.h" | 16 #include "base/file_util.h" |
18 #include "base/path_service.h" | 17 #include "base/path_service.h" |
19 #include "content/public/app/content_main.h" | 18 #include "content/public/app/content_main.h" |
20 #include "extensions/shell/app/shell_main_delegate.h" | 19 #include "extensions/shell/app/shell_main_delegate.h" |
21 #include "extensions/shell/browser/shell_browser_main_delegate.h" | 20 #include "extensions/shell/browser/shell_browser_main_delegate.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 athena::StartAthena( | 104 athena::StartAthena( |
106 extensions::ShellDesktopController::instance()->host()->window(), | 105 extensions::ShellDesktopController::instance()->host()->window(), |
107 new athena::ContentActivityFactory(), | 106 new athena::ContentActivityFactory(), |
108 new athena::ContentAppModelBuilder(context)); | 107 new athena::ContentAppModelBuilder(context)); |
109 athena::HomeCard::Get()->RegisterSearchProvider( | 108 athena::HomeCard::Get()->RegisterSearchProvider( |
110 new athena::UrlSearchProvider(context)); | 109 new athena::UrlSearchProvider(context)); |
111 athena::VirtualKeyboardManager::Create(context); | 110 athena::VirtualKeyboardManager::Create(context); |
112 keyboard_observer_.reset(new VirtualKeyboardObserver()); | 111 keyboard_observer_.reset(new VirtualKeyboardObserver()); |
113 | 112 |
114 CreateTestPages(context); | 113 CreateTestPages(context); |
115 CreateDebugWindow(); | |
116 } | 114 } |
117 | 115 |
118 virtual void Shutdown() OVERRIDE { | 116 virtual void Shutdown() OVERRIDE { |
119 keyboard_observer_.reset(); | 117 keyboard_observer_.reset(); |
120 athena::ShutdownAthena(); | 118 athena::ShutdownAthena(); |
121 } | 119 } |
122 | 120 |
123 virtual extensions::ShellDesktopController* CreateDesktopController() | 121 virtual extensions::ShellDesktopController* CreateDesktopController() |
124 OVERRIDE { | 122 OVERRIDE { |
125 // TODO(mukai): create Athena's own ShellDesktopController subclass so that | 123 // TODO(mukai): create Athena's own ShellDesktopController subclass so that |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 | 198 |
201 int main(int argc, const char** argv) { | 199 int main(int argc, const char** argv) { |
202 AthenaMainDelegate delegate; | 200 AthenaMainDelegate delegate; |
203 content::ContentMainParams params(&delegate); | 201 content::ContentMainParams params(&delegate); |
204 | 202 |
205 params.argc = argc; | 203 params.argc = argc; |
206 params.argv = argv; | 204 params.argv = argv; |
207 | 205 |
208 return content::ContentMain(params); | 206 return content::ContentMain(params); |
209 } | 207 } |
OLD | NEW |