[Ozone-DRI] Assume window IPC arrives before surface IPC

ui/ozone/platform/dri/gbm_surface_factory.h

 // 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.
 
 #ifndef UI_OZONE_PLATFORM_DRI_GBM_SURFACE_FACTORY_H_
 #define UI_OZONE_PLATFORM_DRI_GBM_SURFACE_FACTORY_H_
 
 #include "ui/ozone/platform/dri/dri_surface_factory.h"
 
 namespace ui {
 
 class DriWindowDelegate;
 class DriWindowDelegateManager;
 class GbmWrapper;
-class ScreenManager;
 
 class GbmSurfaceFactory : public DriSurfaceFactory {
  public:
   GbmSurfaceFactory(bool allow_surfaceless);
   ~GbmSurfaceFactory() override;
 
   void InitializeGpu(GbmWrapper* gbm,
-                     ScreenManager* screen_manager,
                      DriWindowDelegateManager* window_manager);
 
   // DriSurfaceFactory:
   intptr_t GetNativeDisplay() override;
   int GetDrmFd() override;
   const int32_t* GetEGLSurfaceProperties(const int32_t* desired_list) override;
   bool LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) override;
   scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
@@ skipping 10 matching lines @@
   bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                             int plane_z_order,
                             gfx::OverlayTransform plane_transform,
                             scoped_refptr<NativePixmap> buffer,
                             const gfx::Rect& display_bounds,
                             const gfx::RectF& crop_rect) override;
   bool CanShowPrimaryPlaneAsOverlay() override;
   bool CanCreateNativePixmap(BufferUsage usage) override;
 
  private:
-  DriWindowDelegate* GetOrCreateWindowDelegate(gfx::AcceleratedWidget widget);
-
   GbmWrapper* gbm_;                // Not owned.
-  ScreenManager* screen_manager_;  // Not owned.
   bool allow_surfaceless_;
 
   DISALLOW_COPY_AND_ASSIGN(GbmSurfaceFactory);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRI_GBM_SURFACE_FACTORY_H_