exo: Initial support for multiple displays in ARC

components/exo/display.cc

Index: components/exo/display.cc
diff --git a/components/exo/display.cc b/components/exo/display.cc
index e3554d02f4145f7fef009daa4407f62f2b08c820..44b975a24256036c792f93acae4a79d0cd3aa28c 100644
--- a/components/exo/display.cc
+++ b/components/exo/display.cc
@@ -141,8 +141,9 @@ std::unique_ptr<ShellSurface> Display::CreateShellSurface(Surface* surface) {
   }
 
   return base::MakeUnique<ShellSurface>(
-      surface, nullptr, gfx::Rect(), true /* activatable */,
-      false /* can_minimize */, ash::kShellWindowId_DefaultContainer);
+      surface, nullptr, ShellSurface::BoundsMode::SHELL, gfx::Point(),
+      true /* activatable */, false /* can_minimize */,
+      ash::kShellWindowId_DefaultContainer);
 }
 
 std::unique_ptr<ShellSurface> Display::CreatePopupShellSurface(
@@ -162,22 +163,23 @@ std::unique_ptr<ShellSurface> Display::CreatePopupShellSurface(
     return nullptr;
   }
 
-  // Determine the initial bounds for popup. |position| is relative to the
-  // parent's main surface origin and initial bounds are in screen coordinates.
+  // |position| is relative to the parent's main surface origin, and |origin| is
+  // in screen coordinates.
   gfx::Point origin = position;
   wm::ConvertPointToScreen(
       ShellSurface::GetMainSurface(parent->GetWidget()->GetNativeWindow())
           ->window(),
       &origin);
-  gfx::Rect initial_bounds(origin, gfx::Size(1, 1));
 
   return base::MakeUnique<ShellSurface>(
-      surface, parent, initial_bounds, false /* activatable */,
-      false /* can_minimize */, ash::kShellWindowId_DefaultContainer);
+      surface, parent, ShellSurface::BoundsMode::FIXED, origin,
+      false /* activatable */, false /* can_minimize */,
+      ash::kShellWindowId_DefaultContainer);
 }
 
 std::unique_ptr<ShellSurface> Display::CreateRemoteShellSurface(
     Surface* surface,
+    const gfx::Point& origin,
     int container) {
   TRACE_EVENT2("exo", "Display::CreateRemoteShellSurface", "surface",
                surface->AsTracedValue(), "container", container);
@@ -190,9 +192,9 @@ std::unique_ptr<ShellSurface> Display::CreateRemoteShellSurface(
   // Remote shell surfaces in system modal container cannot be minimized.
   bool can_minimize = container != ash::kShellWindowId_SystemModalContainer;
 
-  return base::MakeUnique<ShellSurface>(surface, nullptr, gfx::Rect(1, 1),
-                                        true /* activatable */, can_minimize,
-                                        container);
+  return base::MakeUnique<ShellSurface>(
+      surface, nullptr, ShellSurface::BoundsMode::CLIENT, origin,
+      true /* activatable */, can_minimize, container);
 }
 
 std::unique_ptr<SubSurface> Display::CreateSubSurface(Surface* surface,