Make the minimized home card not overlap activities on Athena

athena/main/athena_launcher.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/main/athena_launcher.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/home/public/home_card.h"
 #include "athena/input/public/input_manager.h"
@@ skipping 36 matching lines @@
   // views::ViewsDelegate:
   virtual void OnBeforeWidgetInit(
       views::Widget::InitParams* params,
       views::internal::NativeWidgetDelegate* delegate) OVERRIDE {
   }
 
   DISALLOW_COPY_AND_ASSIGN(AthenaViewsDelegate);
 };
 
 void StartAthena(aura::Window* root_window,
+                 athena::ScreenManagerDelegate* delegate,
                  athena::ActivityFactory* activity_factory,
                  athena::AppModelBuilder* app_model_builder) {
 #if defined(USE_X11)
   ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
 
   views::ViewsDelegate::views_delegate = new AthenaViewsDelegate();
 
   RootWindowState* root_window_state = new RootWindowState;
   root_window->SetProperty(kRootWindowStateKey, root_window_state);
 
   root_window_state->visibility_client.reset(new ::wm::VisibilityController);
   aura::client::SetVisibilityClient(root_window,
                                     root_window_state->visibility_client.get());
 
   athena::SystemUI::Create();
   athena::InputManager::Create()->OnRootWindowCreated(root_window);
-  athena::ScreenManager::Create(root_window);
+  athena::ScreenManager::Create(delegate, root_window);
   athena::WindowManager::Create();
   athena::HomeCard::Create(app_model_builder);
   athena::ActivityManager::Create();
   athena::ActivityFactory::RegisterActivityFactory(activity_factory);
   SetupBackgroundImage();
 }
 
 void ShutdownAthena() {
   athena::ActivityFactory::Shutdown();
   athena::ActivityManager::Shutdown();
   athena::HomeCard::Shutdown();
   athena::WindowManager::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::SystemUI::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
 }
 
 }  // namespace athena