exo: Clean up display configuration protocol

components/exo/wayland/server.cc

Index: components/exo/wayland/server.cc
diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index 85a4b9aa073296670d530964d2a6ef62fd0835eb..9b6c097c8ae44bbc154f6376e10dc1ab1dbe43b0 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc
@@ -2127,7 +2127,6 @@ class WaylandRemoteShell : public WMHelper::MaximizeModeObserver,
     needs_send_display_metrics_ = false;
 
     const display::Screen* screen = display::Screen::GetScreen();
-    display::Display primary_display = screen->GetPrimaryDisplay();
 
     if (IsMultiDisplaySupported()) {
       for (const auto& display : screen->GetAllDisplays()) {
@@ -2139,18 +2138,15 @@ class WaylandRemoteShell : public WMHelper::MaximizeModeObserver,
             static_cast<uint32_t>(display.id() >> 32),
             static_cast<uint32_t>(display.id()),
             bounds.x(), bounds.y(), bounds.width(), bounds.height(),
-            insets.left(), insets.top(), insets.right(), insets.bottom());
+            insets.left(), insets.top(), insets.right(), insets.bottom(),
+            OutputTransform(display.rotation()),
+            wl_fixed_from_double(display.device_scale_factor()));
       }
 
-      zcr_remote_shell_v1_send_configure(
-          remote_shell_resource_,
-          static_cast<uint32_t>(primary_display.id() >> 32),
-          static_cast<uint32_t>(primary_display.id()),
-          OutputTransform(primary_display.rotation()),
-          wl_fixed_from_double(primary_display.device_scale_factor()),
-          layout_mode_);
+      zcr_remote_shell_v1_send_configure(remote_shell_resource_, layout_mode_);
     }
 
+    display::Display primary_display = screen->GetPrimaryDisplay();
     const gfx::Insets& insets = primary_display.GetWorkAreaInsets();
 
     zcr_remote_shell_v1_send_configuration_changed(