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

ash/screen_util.h

Index: ash/screen_util.h
diff --git a/ash/screen_util.h b/ash/screen_util.h
index 2351c4cd124b5dce74a7bf05931b69d9859ac570..971215e3e328a0412578d6b8e97964de43e7e808 100644
--- a/ash/screen_util.h
+++ b/ash/screen_util.h
@@ -37,6 +37,15 @@ class ASH_EXPORT ScreenUtil {
   // Returns the display's work area bounds in parent coordinates.
   static gfx::Rect GetDisplayWorkAreaBoundsInParent(aura::Window* window);
 
+  // Returns the physical display bounds containing the shelf that
+  // shares the same root window as |root|. Physical displays can
+  // differ from logical displays in unified desktop mode.
+  // TODO(oshima): If we need to expand the unified desktop support to
+  // general use, we should consider always using physical display in
+  // window layout instead of root window, and keep the logical
+  // display only in display management code.
+  static gfx::Rect GetShelfDisplayBoundsInScreen(aura::Window* window);
+
   // TODO(oshima): Move following two to wm/coordinate_conversion.h
   // Converts |rect| from |window|'s coordinates to the virtual screen
   // coordinates.
@@ -52,10 +61,6 @@ class ASH_EXPORT ScreenUtil {
   // invalid display if there is no secondary display connected.
   static const gfx::Display& GetSecondaryDisplay();
 
-  // Returns a gfx::Display object for the specified id.  Returns
-  // invalid display if no such display is connected.
-  static const gfx::Display& GetDisplayForId(int64 display_id);
-
  private:
   ScreenUtil() {}
   ~ScreenUtil() {}