exo: Clean up display configuration protocol

components/exo/wayland/server.cc

 // Copyright 2015 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 "components/exo/wayland/server.h"
 
 #include <alpha-compositing-unstable-v1-server-protocol.h>
 #include <gaming-input-unstable-v1-server-protocol.h>
 #include <gaming-input-unstable-v2-server-protocol.h>
 #include <grp.h>
@@ skipping 2109 matching lines @@
                               weak_ptr_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(delay_ms));
   }
 
   void SendDisplayMetrics() {
     if (!needs_send_display_metrics_)
       return;
     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()) {
         const gfx::Rect& bounds = display.bounds();
         const gfx::Insets& insets = display.GetWorkAreaInsets();
 
         zcr_remote_shell_v1_send_workspace(
             remote_shell_resource_,
             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(
         remote_shell_resource_,
         primary_display.size().width(),
         primary_display.size().height(),
         OutputTransform(primary_display.rotation()),
         wl_fixed_from_double(primary_display.device_scale_factor()),
         insets.left(), insets.top(), insets.right(), insets.bottom(),
         layout_mode_);
@@ skipping 1754 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo