Remove synchronous GetDisplays() and Configure() from NativeDisplayDelegate

ui/ozone/platform/dri/native_display_delegate_proxy.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/ozone/platform/dri/native_display_delegate_proxy.h"
 
 #include <stdio.h>
 
 #include "base/logging.h"
 #include "ui/display/types/display_snapshot.h"
@@ skipping 77 matching lines @@
 }
 
 void NativeDisplayDelegateProxy::SetBackgroundColor(uint32_t color_argb) {
   NOTIMPLEMENTED();
 }
 
 void NativeDisplayDelegateProxy::ForceDPMSOn() {
   proxy_->Send(new OzoneGpuMsg_ForceDPMSOn());
 }
 
-std::vector<DisplaySnapshot*> NativeDisplayDelegateProxy::GetDisplays() {
-  // GetDisplays() is supposed to force a refresh of the display list.
-  proxy_->Send(new OzoneGpuMsg_RefreshNativeDisplays(
-      std::vector<DisplaySnapshot_Params>()));
-  return displays_.get();
-}
-
 void NativeDisplayDelegateProxy::GetDisplays(
     const GetDisplaysCallback& callback) {
-  callback.Run(GetDisplays());
+  // GetDisplays() is supposed to force a refresh of the display list.
+  proxy_->Send(new OzoneGpuMsg_RefreshNativeDisplays(
+      std::vector<DisplaySnapshot_Params>()));
+  callback.Run(displays_.get());
 }
 
 void NativeDisplayDelegateProxy::AddMode(const DisplaySnapshot& output,
                                          const DisplayMode* mode) {
 }
 
-bool NativeDisplayDelegateProxy::Configure(const DisplaySnapshot& output,
+void NativeDisplayDelegateProxy::Configure(const DisplaySnapshot& output,
                                            const DisplayMode* mode,
-                                           const gfx::Point& origin) {
+                                           const gfx::Point& origin,
+                                           const ConfigureCallback& callback) {
   // TODO(dnicoara) Should handle an asynchronous response.
   if (mode)
     proxy_->Send(new OzoneGpuMsg_ConfigureNativeDisplay(
         output.display_id(), GetDisplayModeParams(*mode), origin));
   else
     proxy_->Send(new OzoneGpuMsg_DisableNativeDisplay(output.display_id()));
 
-  return true;
-}
-
-void NativeDisplayDelegateProxy::Configure(const DisplaySnapshot& output,
-                                           const DisplayMode* mode,
-                                           const gfx::Point& origin,
-                                           const ConfigureCallback& callback) {
-  callback.Run(Configure(output, mode, origin));
+  callback.Run(true);
 }
 
 void NativeDisplayDelegateProxy::CreateFrameBuffer(const gfx::Size& size) {
 }
 
 bool NativeDisplayDelegateProxy::GetHDCPState(const DisplaySnapshot& output,
                                               HDCPState* state) {
   NOTIMPLEMENTED();
   return false;
 }
@@ skipping 96 matching lines @@
   displays_.clear();
   for (size_t i = 0; i < displays.size(); ++i)
     displays_.push_back(
         new DriDisplaySnapshotProxy(displays[i], display_manager_));
 
   FOR_EACH_OBSERVER(NativeDisplayObserver, observers_,
                     OnConfigurationChanged());
 }
 
 }  // namespace ui