WIP: simplified display management in ash

ash/aura/shell_port_classic.cc

 // Copyright 2016 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 "ash/aura/shell_port_classic.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
@@ skipping 24 matching lines @@
 #include "ash/wm/workspace/workspace_event_handler_aura.h"
 #include "ash/wm_display_observer.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/env.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/types/native_display_delegate.h"
 
 #if defined(USE_X11)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
+#include "ui/display/manager/chromeos/x11/native_display_delegate_x11.h"
+#include "ui/gfx/x/x11_types.h"  // nogncheck
 #endif
 
 #if defined(USE_OZONE)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
 #include "ui/display/types/native_display_delegate.h"
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace ash {
 
@@ skipping 202 matching lines @@
 
 void ShellPortClassic::InitHosts(const ShellInitParams& init_params) {
   Shell::Get()->window_tree_host_manager()->InitHosts();
 }
 
 std::unique_ptr<display::NativeDisplayDelegate>
 ShellPortClassic::CreateNativeDisplayDelegate() {
 #if defined(USE_OZONE)
   return ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate();
 #else
-  return nullptr;
+  return base::MakeUnique<display::NativeDisplayDelegateX11>();
 #endif
 }
 
 std::unique_ptr<AcceleratorController>
 ShellPortClassic::CreateAcceleratorController() {
   DCHECK(!accelerator_controller_delegate_);
   accelerator_controller_delegate_ =
       base::MakeUnique<AcceleratorControllerDelegateAura>();
   return base::MakeUnique<AcceleratorController>(
       accelerator_controller_delegate_.get(), nullptr);
 }
 
 void ShellPortClassic::OnDisplayConfigurationChanging() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanging();
 }
 
 void ShellPortClassic::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace ash