Layout login/lock screen, shelf and app list inside the first display in Unified Desktop mode

ash/display/display_controller.cc

 // Copyright (c) 2012 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/display/display_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 
 #include "ash/ash_switches.h"
 #include "ash/display/cursor_window_controller.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/root_window_transformers.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/root_window_transformer.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
+#include "ash/system/tray/system_tray.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ skipping 601 matching lines @@
       DisplayManager::UNIFIED) {
     if (primary_display_id == gfx::Display::kInvalidDisplayID)
       primary_display_id = display.id();
     AshWindowTreeHost* ash_host =
         AddWindowTreeHostForDisplay(display, AshWindowTreeHostInitParams());
     RootWindowController::CreateForSecondaryDisplay(ash_host);
 
     if (primary_tree_host_for_replace_) {
       AshWindowTreeHost* to_delete = primary_tree_host_for_replace_;
       primary_tree_host_for_replace_ = nullptr;
+
+      // Show the shelf if the original WTH had a visible system
+      // tray. It may or may not be visible depending on OOBE state.
+      ash::SystemTray* old_tray =
+          GetRootWindowController(to_delete->AsWindowTreeHost()->window())
+              ->GetSystemTray();
+      ash::SystemTray* new_tray =
+          ash::Shell::GetInstance()->GetPrimarySystemTray();
+      if (old_tray->GetWidget()->IsVisible()) {
+        new_tray->SetVisible(true);
+        new_tray->GetWidget()->Show();
+      }
+
       DeleteHost(to_delete);
 #ifndef NDEBUG
       auto iter = std::find_if(
           window_tree_hosts_.begin(), window_tree_hosts_.end(),
           [to_delete](const std::pair<int64, AshWindowTreeHost*>& pair) {
             return pair.second == to_delete;
           });
       DCHECK(iter == window_tree_hosts_.end());
 #endif
       // the host has already been removed from the window_tree_host_.
@@ skipping 217 matching lines @@
   Shell::GetInstance()->display_configurator_animation()
       ->StartFadeInAnimation();
 #endif
 }
 
 void DisplayController::SetMirrorModeAfterAnimation(bool mirror) {
   GetDisplayManager()->SetMirrorMode(mirror);
 }
 
 }  // namespace ash