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

athena/screen/screen_manager_impl.cc

Index: athena/screen/screen_manager_impl.cc
diff --git a/athena/screen/screen_manager_impl.cc b/athena/screen/screen_manager_impl.cc
index 3877e413f5d4b7b7ab455c9e9e68b9755f465d73..27f216ce1d800bb8f6b6aaf34f148281da8e8513 100644
--- a/athena/screen/screen_manager_impl.cc
+++ b/athena/screen/screen_manager_impl.cc
@@ -208,6 +208,7 @@ class ScreenManagerImpl : public ScreenManager {
 
   aura::Window* root_window_;
   aura::Window* background_window_;
+  aura::Window* popup_window_;
 
   scoped_ptr<BackgroundController> background_controller_;
   scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
@@ -236,10 +237,14 @@ void ScreenManagerImpl::Init() {
   root_window_->SetLayoutManager(new FillLayoutManager(root_window_));
   background_window_ =
       CreateContainer(ContainerParams("AthenaBackground", CP_BACKGROUND));
-
   background_window_->SetLayoutManager(
       new FillLayoutManager(background_window_));
-  background_controller_.reset(new BackgroundController(background_window_));
+  ContainerParams popup_params("AthenaPopup", CP_POPUP);
+  popup_params.can_activate_children = true;
+  popup_window_ = CreateContainer(popup_params);
+
+  background_controller_.reset(new BackgroundController(background_window_,
+                                                        popup_window_));
 
   capture_client_.reset(new ::wm::ScopedCaptureClient(root_window_));
   accelerator_handler_.reset(new ScreenAcceleratorHandler(root_window_));