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

ash/system/web_notification/ash_popup_alignment_delegate.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/system/web_notification/ash_popup_alignment_delegate.h"
 
 #include "ash/display/display_controller.h"
+#include "ash/screen_util.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "base/i18n/rtl.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/screen.h"
@@ skipping 111 matching lines @@
 }
 
 gfx::Display AshPopupAlignmentDelegate::GetCurrentDisplay() const {
   return Shell::GetScreen()->GetDisplayNearestWindow(
       shelf_->shelf_widget()->GetNativeView());
 }
 
 void AshPopupAlignmentDelegate::UpdateWorkArea(const gfx::Display& display,
                                                ShelfAutoHideState new_state) {
   work_area_ = display.work_area();
+  if (Shell::GetInstance()->display_manager()->IsInUnifiedMode()) {
+    gfx::Rect bounds = ScreenUtil::GetShelfDisplayBoundsInScreen(
+        shelf_->shelf_widget()->GetNativeView());
+    work_area_.Intersect(bounds);
+  }
+
   int width = 0;
   if (shelf_ && (shelf_->visibility_state() == SHELF_AUTO_HIDE) &&
       new_state == SHELF_AUTO_HIDE_SHOWN) {
     // Since the work_area is already reduced by kAutoHideSize, the inset width
     // should be just the difference.
     width = kShelfSize - ShelfLayoutManager::kAutoHideSize;
   }
   work_area_.Inset(shelf_->SelectValueForShelfAlignment(
       gfx::Insets(0, 0, width, 0),
       gfx::Insets(0, width, 0, 0),
@@ skipping 23 matching lines @@
 
 void AshPopupAlignmentDelegate::OnDisplayMetricsChanged(
     const gfx::Display& display,
     uint32_t metrics) {
   UpdateShelf();
   if (shelf_ && GetCurrentDisplay().id() == display.id())
     UpdateWorkArea(display, shelf_->auto_hide_state());
 }
 
 }  // namespace ash