Split //ui/display and create //ui/display/manager.

ui/display/manager/chromeos/x11/native_display_delegate_x11.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/display/chromeos/x11/native_display_delegate_x11.h"
+#include "ui/display/manager/chromeos/x11/native_display_delegate_x11.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
+#include <X11/extensions/XInput2.h>
 #include <X11/extensions/Xrandr.h>
-#include <X11/extensions/XInput2.h>
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "ui/display/chromeos/x11/display_mode_x11.h"
-#include "ui/display/chromeos/x11/display_snapshot_x11.h"
-#include "ui/display/chromeos/x11/display_util_x11.h"
-#include "ui/display/chromeos/x11/native_display_event_dispatcher_x11.h"
+#include "ui/display/manager/chromeos/x11/display_mode_x11.h"
+#include "ui/display/manager/chromeos/x11/display_snapshot_x11.h"
+#include "ui/display/manager/chromeos/x11/display_util_x11.h"
+#include "ui/display/manager/chromeos/x11/native_display_event_dispatcher_x11.h"
 #include "ui/display/types/native_display_observer.h"
 #include "ui/display/util/x11/edid_parser_x11.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/x/x11_error_tracker.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 namespace {
@@ skipping 117 matching lines @@
 void NativeDisplayDelegateX11::TakeDisplayControl(
     const DisplayControlCallback& callback) {
   NOTIMPLEMENTED();
 }
 
 void NativeDisplayDelegateX11::RelinquishDisplayControl(
     const DisplayControlCallback& callback) {
   NOTIMPLEMENTED();
 }
 
-void NativeDisplayDelegateX11::SyncWithServer() { XSync(display_, 0); }
+void NativeDisplayDelegateX11::SyncWithServer() {
+  XSync(display_, 0);
+}
 
 void NativeDisplayDelegateX11::SetBackgroundColor(uint32_t color_argb) {
   background_color_argb_ = color_argb;
 }
 
 void NativeDisplayDelegateX11::ForceDPMSOn() {
   CHECK(DPMSEnable(display_));
   CHECK(DPMSForceLevel(display_, DPMSModeOn));
 }
 
@@ skipping 414 matching lines @@
           nitems == 1) {
         Atom value = reinterpret_cast<Atom*>(values)[0];
         if (full_aspect_atom == value)
           return true;
       }
     }
   }
   return false;
 }
 
-
 std::vector<ColorCalibrationProfile>
 NativeDisplayDelegateX11::GetAvailableColorCalibrationProfiles(
     const DisplaySnapshot& output) {
   // TODO(mukai|marcheu): Checks the system data and fills the result.
   // Note that the order would be Dynamic -> Standard -> Movie -> Reading.
   return std::vector<ColorCalibrationProfile>();
 }
 
 bool NativeDisplayDelegateX11::SetColorCalibrationProfile(
     const DisplaySnapshot& output,
     ColorCalibrationProfile new_profile) {
   const DisplaySnapshotX11& x11_output =
       static_cast<const DisplaySnapshotX11&>(output);
 
   XRRCrtcGamma* gamma_ramp = CreateGammaRampForProfile(x11_output, new_profile);
 
   if (!gamma_ramp)
     return false;
 
   int gamma_ramp_size = XRRGetCrtcGammaSize(display_, x11_output.crtc());
-  XRRSetCrtcGamma(display_,
-                  x11_output.crtc(),
+  XRRSetCrtcGamma(display_, x11_output.crtc(),
                   ResampleGammaRamp(gamma_ramp, gamma_ramp_size));
   XRRFreeGamma(gamma_ramp);
   return true;
 }
 
 XRRCrtcGamma* NativeDisplayDelegateX11::CreateGammaRampForProfile(
     const DisplaySnapshotX11& x11_output,
     ColorCalibrationProfile new_profile) {
   // TODO(mukai|marcheu): Creates the appropriate gamma ramp data from the
   // profile enum. It would be served by the vendor.
@@ skipping 28 matching lines @@
   XSetForeground(display_, gc, color.pixel);
   XSetFillStyle(display_, gc, FillSolid);
   int width = DisplayWidth(display_, DefaultScreen(display_));
   int height = DisplayHeight(display_, DefaultScreen(display_));
   XFillRectangle(display_, window_, gc, 0, 0, width, height);
   XFreeGC(display_, gc);
   XFreeColors(display_, colormap, &color.pixel, 1, 0);
 }
 
 }  // namespace ui