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 "apps/shell/app/shell_main_delegate.h" | 5 #include "apps/shell/app/shell_main_delegate.h" |
6 #include "apps/shell/browser/shell_browser_main_delegate.h" | 6 #include "apps/shell/browser/shell_browser_main_delegate.h" |
7 #include "apps/shell/browser/shell_desktop_controller.h" | 7 #include "apps/shell/browser/shell_desktop_controller.h" |
8 #include "athena/content/public/content_activity_factory.h" | 8 #include "athena/content/public/content_activity_factory.h" |
| 9 #include "athena/content/public/content_app_model_builder.h" |
9 #include "athena/main/athena_launcher.h" | 10 #include "athena/main/athena_launcher.h" |
10 #include "athena/main/placeholder.h" | 11 #include "athena/main/placeholder.h" |
11 #include "athena/main/placeholder_content.h" | 12 #include "athena/main/placeholder_content.h" |
12 #include "content/public/app/content_main.h" | 13 #include "content/public/app/content_main.h" |
13 #include "ui/aura/window_tree_host.h" | 14 #include "ui/aura/window_tree_host.h" |
14 #include "ui/wm/core/visibility_controller.h" | 15 #include "ui/wm/core/visibility_controller.h" |
15 | 16 |
16 class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate { | 17 class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate { |
17 public: | 18 public: |
18 AthenaBrowserMainDelegate() {} | 19 AthenaBrowserMainDelegate() {} |
19 virtual ~AthenaBrowserMainDelegate() {} | 20 virtual ~AthenaBrowserMainDelegate() {} |
20 | 21 |
21 // apps::ShellBrowserMainDelegate: | 22 // apps::ShellBrowserMainDelegate: |
22 virtual void Start(content::BrowserContext* context) OVERRIDE { | 23 virtual void Start(content::BrowserContext* context) OVERRIDE { |
23 athena::StartAthena( | 24 athena::StartAthena( |
24 apps::ShellDesktopController::instance()->host()->window(), | 25 apps::ShellDesktopController::instance()->host()->window(), |
25 new athena::ContentActivityFactory()); | 26 new athena::ContentActivityFactory(), |
| 27 new athena::ContentAppModelBuilder(context)); |
26 CreateTestWindows(); | 28 CreateTestWindows(); |
27 CreateTestPages(context); | 29 CreateTestPages(context); |
28 } | 30 } |
29 | 31 |
30 virtual void Shutdown() OVERRIDE { athena::ShutdownAthena(); } | 32 virtual void Shutdown() OVERRIDE { athena::ShutdownAthena(); } |
31 | 33 |
32 virtual apps::ShellDesktopController* CreateDesktopController() OVERRIDE { | 34 virtual apps::ShellDesktopController* CreateDesktopController() OVERRIDE { |
33 // TODO(mukai): create Athena's own ShellDesktopController subclass so that | 35 // TODO(mukai): create Athena's own ShellDesktopController subclass so that |
34 // it can initialize its own window manager logic. | 36 // it can initialize its own window manager logic. |
35 return new apps::ShellDesktopController(); | 37 return new apps::ShellDesktopController(); |
(...skipping 20 matching lines...) Expand all Loading... |
56 | 58 |
57 int main(int argc, const char** argv) { | 59 int main(int argc, const char** argv) { |
58 AthenaMainDelegate delegate; | 60 AthenaMainDelegate delegate; |
59 content::ContentMainParams params(&delegate); | 61 content::ContentMainParams params(&delegate); |
60 | 62 |
61 params.argc = argc; | 63 params.argc = argc; |
62 params.argv = argv; | 64 params.argv = argv; |
63 | 65 |
64 return content::ContentMain(params); | 66 return content::ContentMain(params); |
65 } | 67 } |
OLD | NEW |