mash: Add status area container to mash window manager

mash/wm/root_window_controller.cc

 // Copyright 2016 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 "mash/wm/root_window_controller.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/event_matcher_util.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
 #include "mash/session/public/interfaces/session.mojom.h"
 #include "mash/wm/background_layout.h"
 #include "mash/wm/fill_layout.h"
 #include "mash/wm/screenlock_layout.h"
 #include "mash/wm/shadow_controller.h"
-#include "mash/wm/shelf_layout.h"
+#include "mash/wm/shelf_layout_manager.h"
+#include "mash/wm/status_layout_manager.h"
 #include "mash/wm/window_layout.h"
 #include "mash/wm/window_manager.h"
 #include "mash/wm/window_manager_application.h"
 #include "services/shell/public/cpp/connector.h"
 
 namespace mash {
 namespace wm {
 namespace {
 
 const uint32_t kWindowSwitchAccelerator = 1;
@@ skipping 55 matching lines @@
   switch (id) {
     case kWindowSwitchAccelerator:
       window_manager_client()->ActivateNextWindow();
       break;
     default:
       app_->OnAccelerator(id, event);
       break;
   }
 }
 
-ShelfLayout* RootWindowController::GetShelfLayoutManager() {
-  return static_cast<ShelfLayout*>(
+ShelfLayoutManager* RootWindowController::GetShelfLayoutManager() {
+  return static_cast<ShelfLayoutManager*>(
       layout_manager_[GetWindowForContainer(mojom::Container::USER_SHELF)]
           .get());
 }
 
+StatusLayoutManager* RootWindowController::GetStatusLayoutManager() {
+  return static_cast<StatusLayoutManager*>(
+      layout_manager_[GetWindowForContainer(mojom::Container::STATUS)].get());
+}
+
 RootWindowController::RootWindowController(WindowManagerApplication* app)
     : app_(app), root_(nullptr), window_count_(0) {
   window_manager_.reset(new WindowManager);
 }
 
 RootWindowController::~RootWindowController() {}
 
 void RootWindowController::AddAccelerators() {
   window_manager_client()->AddAccelerator(
       kWindowSwitchAccelerator,
@@ skipping 12 matching lines @@
 
   CreateContainers();
 
   // Override the default layout managers for certain containers.
   mus::Window* user_background =
       GetWindowForContainer(mojom::Container::USER_BACKGROUND);
   layout_manager_[user_background].reset(new BackgroundLayout(user_background));
   mus::Window* login_app = GetWindowForContainer(mojom::Container::LOGIN_APP);
   layout_manager_[login_app].reset(new ScreenlockLayout(login_app));
   mus::Window* user_shelf = GetWindowForContainer(mojom::Container::USER_SHELF);
-  layout_manager_[user_shelf].reset(new ShelfLayout(user_shelf));
+  layout_manager_[user_shelf].reset(new ShelfLayoutManager(user_shelf));
+  mus::Window* status = GetWindowForContainer(mojom::Container::STATUS);
+  layout_manager_[status].reset(new StatusLayoutManager(status));
 
   mus::Window* window = GetWindowForContainer(mojom::Container::USER_WINDOWS);
   layout_manager_[window].reset(new WindowLayout(window));
   window_manager_client()->AddActivationParent(window);
 
   // Bubble windows must be allowed to activate because some of them rely on
   // deactivation to close.
   mus::Window* bubbles = GetWindowForContainer(mojom::Container::BUBBLES);
   window_manager_client()->AddActivationParent(bubbles);
 
@@ skipping 52 matching lines @@
                   mojom::Container::USER_PRIVATE);
   CreateContainer(mojom::Container::USER_STICKY_WINDOWS,
                   mojom::Container::USER_PRIVATE);
   CreateContainer(mojom::Container::USER_PRESENTATION_WINDOWS,
                   mojom::Container::USER_PRIVATE);
   CreateContainer(mojom::Container::USER_SHELF, mojom::Container::USER_PRIVATE);
   CreateContainer(mojom::Container::LOGIN_WINDOWS, mojom::Container::ROOT);
   CreateContainer(mojom::Container::LOGIN_APP, mojom::Container::LOGIN_WINDOWS);
   CreateContainer(mojom::Container::LOGIN_SHELF,
                   mojom::Container::LOGIN_WINDOWS);
+  CreateContainer(mojom::Container::STATUS, mojom::Container::ROOT);
   CreateContainer(mojom::Container::BUBBLES, mojom::Container::ROOT);
   CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS,
                   mojom::Container::ROOT);
   CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT);
   CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT);
   CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT);
 }
 
 }  // namespace wm
 }  // namespace mash