Index: athena/main/athena_main.cc |
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc |
index 3a334d72b74ab5cbcdf34cf7c56b055fd025895e..8e8cc63a7b8a55ec1a6ee3781f9245e26a25202b 100644 |
--- a/athena/main/athena_main.cc |
+++ b/athena/main/athena_main.cc |
@@ -4,7 +4,12 @@ |
#include "apps/shell/app/shell_main_delegate.h" |
#include "apps/shell/browser/shell_browser_main_delegate.h" |
+#include "apps/shell/browser/shell_desktop_controller.h" |
+#include "athena/main/placeholder.h" |
+#include "athena/screen/public/screen_manager.h" |
+#include "athena/wm/public/window_manager.h" |
#include "content/public/app/content_main.h" |
+#include "ui/aura/window_tree_host.h" |
class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate { |
public: |
@@ -12,8 +17,20 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate { |
virtual ~AthenaBrowserMainDelegate() {} |
// apps::ShellBrowserMainDelegate: |
- virtual void Start(content::BrowserContext* context) OVERRIDE {} |
- virtual void Shutdown() OVERRIDE {} |
+ virtual void Start(content::BrowserContext* context) OVERRIDE { |
+ athena::ScreenManager::Create(apps::ShellDesktopController::instance() |
+ ->GetWindowTreeHost() |
+ ->window()); |
+ athena::WindowManager::Create(); |
+ |
+ SetupBackgroundImage(); |
+ CreateTestWindows(); |
+ } |
+ |
+ virtual void Shutdown() OVERRIDE { |
+ athena::WindowManager::Shutdown(); |
+ athena::ScreenManager::Shutdown(); |
+ } |
private: |
DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate); |