[Athena] Add status icons and system time to the desktop background

athena/main/athena_launcher.cc

Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index 693243584c7202825ba6ad2ffac516a8f27184fe..3309802337ee045d3653e2ca7bb74522296cb8e5 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -11,7 +11,6 @@
 #include "athena/home/public/home_card.h"
 #include "athena/home/public/home_card.h"
 #include "athena/input/public/input_manager.h"
-#include "athena/main/debug/debug_window.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/url_search_provider.h"
@@ -112,11 +111,11 @@ void StartAthenaEnv(aura::Window* root_window) {
   aura::client::SetVisibilityClient(root_window,
                                     env_state->visibility_client.get());
 
+  athena::InputManager::Create()->OnRootWindowCreated(root_window);
+  athena::ScreenManager::Create(root_window);
   athena::SystemUI::Create(
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::FILE));
-  athena::InputManager::Create()->OnRootWindowCreated(root_window);
-  athena::ScreenManager::Create(root_window);
   athena::WindowManager::Create();
   SetupBackgroundImage();
 
@@ -136,7 +135,6 @@ void StartAthenaSessionWithContext(content::BrowserContext* context) {
 
   env_state->virtual_keyboard_observer.reset(new VirtualKeyboardObserver);
   CreateTestPages(context);
-  CreateDebugWindow();
 }
 
 void StartAthenaSession(athena::ActivityFactory* activity_factory,
@@ -151,9 +149,9 @@ void ShutdownAthena() {
   athena::ActivityManager::Shutdown();
   athena::HomeCard::Shutdown();
   athena::WindowManager::Shutdown();
+  athena::SystemUI::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
-  athena::SystemUI::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
 }