chromeos: Makes mushrome use simplified display management

ash/aura/shell_port_classic.cc

Index: ash/aura/shell_port_classic.cc
diff --git a/ash/aura/shell_port_classic.cc b/ash/aura/shell_port_classic.cc
index 766ae123ad3c22b46a55d32b78b402ff8085e5f4..f3497b78fb94659c875f4e1cefca5fcd56f5892b 100644
--- a/ash/aura/shell_port_classic.cc
+++ b/ash/aura/shell_port_classic.cc
@@ -42,6 +42,8 @@
 
 #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

[kylechar, 2017/04/27 14:26:30]

Is this include used?

[sky, 2017/04/27 15:09:53]

It came from those in shell.cc. I'll see if the bots are ok without it.

 #endif
 
 #if defined(USE_OZONE)
@@ -267,7 +269,7 @@ ShellPortClassic::CreateNativeDisplayDelegate() {
 #if defined(USE_OZONE)
   return ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate();
 #else
-  return nullptr;
+  return base::MakeUnique<display::NativeDisplayDelegateX11>();
 #endif
 }