Make the minimized home card not overlap activities on Athena

athena/main/athena_main.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/content/public/content_activity_factory.h"
 #include "athena/content/public/content_app_model_builder.h"
 #include "athena/content/public/web_contents_view_delegate_creator.h"
 #include "athena/home/public/home_card.h"
 #include "athena/main/athena_app_window_controller.h"
 #include "athena/main/athena_launcher.h"
 #include "athena/main/debug/debug_window.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/url_search_provider.h"
 #include "athena/screen/public/screen_manager.h"
+#include "athena/screen/public/screen_manager_delegate.h"
 #include "athena/virtual_keyboard/public/virtual_keyboard_manager.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "content/public/app/content_main.h"
 #include "extensions/shell/app/shell_main_delegate.h"
 #include "extensions/shell/browser/shell_browser_main_delegate.h"
 #include "extensions/shell/browser/shell_content_browser_client.h"
 #include "extensions/shell/browser/shell_desktop_controller.h"
 #include "extensions/shell/browser/shell_extension_system.h"
@@ skipping 43 matching lines @@
 
  private:
   // extensions::ShellDesktopController:
   virtual wm::FocusRules* CreateFocusRules() OVERRIDE {
     return athena::ScreenManager::CreateFocusRules();
   }
 
   DISALLOW_COPY_AND_ASSIGN(AthenaDesktopController);
 };
 
+class AthenaScreenManagerDelegate : public athena::ScreenManagerDelegate {
+ public:
+  explicit AthenaScreenManagerDelegate(
+      extensions::ShellDesktopController* controller)
+      : controller_(controller) {
+  }
+
+  virtual ~AthenaScreenManagerDelegate() {
+  }
+
+ private:
+  // athena::ScreenManagerDelegate:
+  virtual void SetWorkAreaInsets(const gfx::Insets& insets) OVERRIDE {
+    controller_->SetDisplayWorkAreaInsets(insets);
+  }
+
+  // Not owned.
+  extensions::ShellDesktopController* controller_;
+
+  DISALLOW_COPY_AND_ASSIGN(AthenaScreenManagerDelegate);
+};
+
 class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate {
  public:
   AthenaBrowserMainDelegate() {}
   virtual ~AthenaBrowserMainDelegate() {}
 
   // extensions::ShellBrowserMainDelegate:
   virtual void Start(content::BrowserContext* context) OVERRIDE {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
     // Force showing in the experimental app-list view.
     command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
     command_line->AppendSwitch(switches::kEnableOverlayScrollbar);
 
     base::FilePath app_dir = base::FilePath::FromUTF8Unsafe(
         command_line->HasSwitch(extensions::switches::kAppShellAppPath)
             ? command_line->GetSwitchValueNative(
                   extensions::switches::kAppShellAppPath)
             : kDefaultAppPath);
 
     base::FilePath app_absolute_dir = base::MakeAbsoluteFilePath(app_dir);
     if (base::DirectoryExists(app_absolute_dir)) {
       extensions::ShellExtensionSystem* extension_system =
           static_cast<extensions::ShellExtensionSystem*>(
               extensions::ExtensionSystem::Get(context));
       extension_system->LoadApp(app_absolute_dir);
     }
 
+    extensions::ShellDesktopController* desktop_controller =
+        extensions::ShellDesktopController::instance();
+    screen_manager_delegate_.reset(
+        new AthenaScreenManagerDelegate(desktop_controller));
+
     athena::StartAthena(
-        extensions::ShellDesktopController::instance()->host()->window(),
+        desktop_controller->host()->window(),
+        screen_manager_delegate_.get(),
         new athena::ContentActivityFactory(),
         new athena::ContentAppModelBuilder(context));
     athena::HomeCard::Get()->RegisterSearchProvider(
         new athena::UrlSearchProvider(context));
     athena::VirtualKeyboardManager::Create(context);
     keyboard_observer_.reset(new VirtualKeyboardObserver());
 
     CreateTestPages(context);
     CreateDebugWindow();
   }
 
   virtual void Shutdown() OVERRIDE {
     keyboard_observer_.reset();
     athena::ShutdownAthena();
   }
 
   virtual extensions::ShellDesktopController* CreateDesktopController()
       OVERRIDE {
     // TODO(mukai): create Athena's own ShellDesktopController subclass so that
     // it can initialize its own window manager logic.
     extensions::ShellDesktopController* desktop = new AthenaDesktopController();
     desktop->SetAppWindowController(new athena::AthenaAppWindowController());
     return desktop;
   }
 
  private:
   scoped_ptr<VirtualKeyboardObserver> keyboard_observer_;
+  scoped_ptr<AthenaScreenManagerDelegate> screen_manager_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
 };
 
 class AthenaContentBrowserClient
     : public extensions::ShellContentBrowserClient {
  public:
   AthenaContentBrowserClient()
       : extensions::ShellContentBrowserClient(new AthenaBrowserMainDelegate()) {
   }
@@ skipping 56 matching lines @@
 
 int main(int argc, const char** argv) {
   AthenaMainDelegate delegate;
   content::ContentMainParams params(&delegate);
 
   params.argc = argc;
   params.argv = argv;
 
   return content::ContentMain(params);
 }