linux_aura: Compile ash into chrome.

ash/display/display_controller.cc

Index: ash/display/display_controller.cc
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
index 53eb429ae3c3e2974ef53cc5828700f7c0c6c33f..53f4f0488430e8bd866056f9a7265e82180fe562 100644
--- a/ash/display/display_controller.cc
+++ b/ash/display/display_controller.cc
@@ -43,6 +43,10 @@
 #if defined(USE_X11)
 #include "ash/display/output_configurator_animation.h"
 #include "chromeos/display/output_configurator.h"
+#endif  // defined(USE_X11)
+#endif  // defined(OS_CHROMEOS)
+
+#if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/x/x11_types.h"
 
@@ -51,7 +55,6 @@
 #include <X11/extensions/Xrandr.h>
 #undef RootWindow
 #endif  // defined(USE_X11)
-#endif  // defined(OS_CHROMEOS)
 
 namespace ash {
 namespace {