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

ash/wm/lock_window_state.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 "ash/wm/lock_window_state.h"
 
+#include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/lock_layout_manager.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_delegate.h"
 #include "ash/wm/window_state_util.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
 #include "ui/aura/window.h"
@@ skipping 140 matching lines @@
     window_state->window()->Show();
   }
 }
 
 wm::WindowStateType LockWindowState::GetMaximizedOrCenteredWindowType(
       wm::WindowState* window_state) {
   return window_state->CanMaximize() ? wm::WINDOW_STATE_TYPE_MAXIMIZED :
                                        wm::WINDOW_STATE_TYPE_NORMAL;
 }
 
+gfx::Rect GetBoundsForLockWindow(aura::Window* window) {
+  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  if (display_manager->IsInUnifiedMode()) {
+    const gfx::Display& first =
+        display_manager->software_mirroring_display_list()[0];
+    return first.bounds();
+  } else {
+    return ScreenUtil::GetDisplayBoundsInParent(window);
+  }
+}
+
 void LockWindowState::UpdateBounds(wm::WindowState* window_state) {
   if (!window_state->IsMaximized() && !window_state->IsFullscreen())
     return;
 
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   gfx::Rect keyboard_bounds;
 
   if (keyboard_controller &&
       !keyboard::IsKeyboardOverscrollEnabled() &&
       keyboard_controller->keyboard_visible()) {
     keyboard_bounds = keyboard_controller->current_keyboard_bounds();
   }
+  gfx::Rect bounds =
+      ScreenUtil::GetShelfDisplayBoundsInScreen(window_state->window());
 
-  gfx::Rect bounds =
-      ScreenUtil::GetDisplayBoundsInParent(window_state->window());
   bounds.set_height(bounds.height() - keyboard_bounds.height());
 
   VLOG(1) << "Updating window bounds to: " << bounds.ToString();
   window_state->SetBoundsDirect(bounds);
 }
 
 }  // namespace ash