Remove synchronous GetDisplays() and Configure() from NativeDisplayDelegate

ui/display/chromeos/x11/native_display_delegate_x11.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 "ui/display/chromeos/x11/native_display_delegate_x11.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/Xrandr.h>
@@ skipping 153 matching lines @@
 
 void NativeDisplayDelegateX11::SetBackgroundColor(uint32_t color_argb) {
   background_color_argb_ = color_argb;
 }
 
 void NativeDisplayDelegateX11::ForceDPMSOn() {
   CHECK(DPMSEnable(display_));
   CHECK(DPMSForceLevel(display_, DPMSModeOn));
 }
 
-std::vector<DisplaySnapshot*> NativeDisplayDelegateX11::GetDisplays() {
+void NativeDisplayDelegateX11::GetDisplays(
+    const GetDisplaysCallback& callback) {
   CHECK(screen_) << "Server not grabbed";
 
   cached_outputs_.clear();
   std::set<RRCrtc> last_used_crtcs;
 
   InitModes();
   for (int i = 0; i < screen_->noutput; ++i) {
     RROutput output_id = screen_->outputs[i];
     XRROutputInfo* output_info = XRRGetOutputInfo(display_, screen_, output_id);
     if (output_info->connection == RR_Connected) {
       DisplaySnapshotX11* output =
           InitDisplaySnapshot(output_id, output_info, &last_used_crtcs, i);
       cached_outputs_.push_back(output);
     }
     XRRFreeOutputInfo(output_info);
   }
 
-  return cached_outputs_.get();
-}
-
-void NativeDisplayDelegateX11::GetDisplays(
-    const GetDisplaysCallback& callback) {
-  callback.Run(GetDisplays());
+  callback.Run(cached_outputs_.get());
 }
 
 void NativeDisplayDelegateX11::AddMode(const DisplaySnapshot& output,
                                        const DisplayMode* mode) {
   CHECK(screen_) << "Server not grabbed";
   CHECK(mode) << "Must add valid mode";
 
   const DisplaySnapshotX11& x11_output =
       static_cast<const DisplaySnapshotX11&>(output);
   RRMode mode_id = static_cast<const DisplayModeX11*>(mode)->mode_id();
 
   VLOG(1) << "AddDisplayMode: output=" << x11_output.output()
           << " mode=" << mode_id;
   XRRAddOutputMode(display_, x11_output.output(), mode_id);
 }
 
-bool NativeDisplayDelegateX11::Configure(const DisplaySnapshot& output,
+void NativeDisplayDelegateX11::Configure(const DisplaySnapshot& output,
                                          const DisplayMode* mode,
-                                         const gfx::Point& origin) {
+                                         const gfx::Point& origin,
+                                         const ConfigureCallback& callback) {
   const DisplaySnapshotX11& x11_output =
       static_cast<const DisplaySnapshotX11&>(output);
   RRMode mode_id = None;
   if (mode)
     mode_id = static_cast<const DisplayModeX11*>(mode)->mode_id();
 
-  return ConfigureCrtc(
-      x11_output.crtc(), mode_id, x11_output.output(), origin.x(), origin.y());
-}
-
-void NativeDisplayDelegateX11::Configure(const DisplaySnapshot& output,
-                                         const DisplayMode* mode,
-                                         const gfx::Point& origin,
-                                         const ConfigureCallback& callback) {
-  callback.Run(Configure(output, mode, origin));
+  callback.Run(ConfigureCrtc(x11_output.crtc(), mode_id, x11_output.output(),
+                             origin.x(), origin.y()));
 }
 
 bool NativeDisplayDelegateX11::ConfigureCrtc(RRCrtc crtc,
                                              RRMode mode,
                                              RROutput output,
                                              int x,
                                              int y) {
   CHECK(screen_) << "Server not grabbed";
   VLOG(1) << "ConfigureCrtc: crtc=" << crtc << " mode=" << mode
           << " output=" << output << " x=" << x << " y=" << y;
@@ skipping 410 matching lines @@
   XSetForeground(display_, gc, color.pixel);
   XSetFillStyle(display_, gc, FillSolid);
   int width = DisplayWidth(display_, DefaultScreen(display_));
   int height = DisplayHeight(display_, DefaultScreen(display_));
   XFillRectangle(display_, window_, gc, 0, 0, width, height);
   XFreeGC(display_, gc);
   XFreeColors(display_, colormap, &color.pixel, 1, 0);
 }
 
 }  // namespace ui