mash: Show status area widget, attempt 2

ash/mus/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 "ash/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/root_window_controller_common.h"
+#include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/system/status_area_widget.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_shelf_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/container_ids.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/screenlock_layout.h"
 #include "ash/mus/shelf_layout_manager.h"
-#include "ash/mus/status_layout_manager.h"
 #include "ash/mus/window_manager.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/common/switches.h"
 #include "services/ui/common/util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
@@ skipping 40 matching lines @@
       window_count_(0),
       display_(display) {
   wm_root_window_controller_.reset(
       new WmRootWindowControllerMus(window_manager_->shell(), this));
 
   root_window_controller_common_.reset(
       new RootWindowControllerCommon(WmWindowMus::Get(root_)));
   root_window_controller_common_->CreateContainers();
   root_window_controller_common_->CreateLayoutManagers();
   CreateLayoutManagers();
+  CreateStatusArea();
 
   disconnected_app_handler_.reset(new DisconnectedAppHandler(root));
 
   // Force a layout of the root, and its children, RootWindowLayout handles
   // both.
   root_window_controller_common_->root_window_layout()->OnWindowResized();
 
   for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) {
     window_manager_->window_manager_client()->AddActivationParent(
         GetWindowByShellWindowId(kActivatableShellWindowIds[i])->mus_window());
@@ skipping 107 matching lines @@
       GetWindowByShellWindowId(kShellWindowId_LockScreenContainer);
   layout_managers_[lock_screen_container->mus_window()].reset(
       new ScreenlockLayout(lock_screen_container->mus_window()));
 
   WmWindowMus* shelf_container =
       GetWindowByShellWindowId(kShellWindowId_ShelfContainer);
   ShelfLayoutManager* shelf_layout_manager =
       new ShelfLayoutManager(shelf_container->mus_window(), this);
   layout_managers_[shelf_container->mus_window()].reset(shelf_layout_manager);
 
-  wm_shelf_.reset(new WmShelfMus(shelf_layout_manager));
-
-  WmWindowMus* status_container =
-      GetWindowByShellWindowId(kShellWindowId_StatusContainer);
-  layout_managers_[status_container->mus_window()].reset(
-      new StatusLayoutManager(status_container->mus_window()));
+  wm_shelf_.reset(new WmShelfMus(wm_root_window_controller_.get()));
 
   WmWindowMus* default_container =
       GetWindowByShellWindowId(kShellWindowId_DefaultContainer);
   // WorkspaceLayoutManager is not a mash::wm::LayoutManager (it's a
   // wm::LayoutManager), so it can't be in |layout_managers_|.
   std::unique_ptr<WorkspaceLayoutManagerDelegateImpl>
       workspace_layout_manager_delegate(new WorkspaceLayoutManagerDelegateImpl(
           wm_root_window_controller_.get()));
   workspace_layout_manager_ = new WorkspaceLayoutManager(
       default_container, std::move(workspace_layout_manager_delegate));
   default_container->SetLayoutManager(
       base::WrapUnique(workspace_layout_manager_));
 
   WmWindowMus* docked_container =
       GetWindowByShellWindowId(kShellWindowId_DockedContainer);
   docked_container->SetLayoutManager(
       base::WrapUnique(new DockedWindowLayoutManager(docked_container)));
 
   WmWindowMus* panel_container =
       GetWindowByShellWindowId(kShellWindowId_PanelContainer);
   panel_container->SetLayoutManager(
       base::WrapUnique(new PanelLayoutManager(panel_container)));
 }
 
+void RootWindowController::CreateStatusArea() {
+  WmWindowMus* status_container =
+      GetWindowByShellWindowId(kShellWindowId_StatusContainer);
+  // Owned by native widget.
+  StatusAreaWidget* status_area_widget =
+      new StatusAreaWidget(status_container, wm_shelf_.get());
+  status_area_widget->CreateTrayViews();
+  // TODO(jamescook): Remove this when ash::StatusAreaLayoutManager and
+  // ash::ShelfLayoutManager are working in mash. http://crbug.com/621112
+  status_area_widget->SetBounds(gfx::Rect(845, 720, 120, 40));
+  if (WmShell::Get()->GetSessionStateDelegate()->IsActiveUserSessionStarted())
+    status_area_widget->Show();
+}
+
 }  // namespace mus
 }  // namespace ash