Fix namespace for src/ui/display/.

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/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 <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.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 display {
 
 namespace {
 
 // DPI measurements.
 const float kMmInInch = 25.4;
 const float kDpi96 = 96.0;
 const float kPixelsToMmScale = kMmInInch / kDpi96;
 
 const char kContentProtectionAtomName[] = "Content Protection";
 const char kProtectionUndesiredAtomName[] = "Undesired";
@@ skipping 235 matching lines @@
 }
 
 void NativeDisplayDelegateX11::AddObserver(NativeDisplayObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void NativeDisplayDelegateX11::RemoveObserver(NativeDisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-display::FakeDisplayController*
-NativeDisplayDelegateX11::GetFakeDisplayController() {
+FakeDisplayController* NativeDisplayDelegateX11::GetFakeDisplayController() {
   return nullptr;
 }
 
 void NativeDisplayDelegateX11::InitModes() {
   CHECK(screen_) << "Server not grabbed";
 
   modes_.clear();
 
   for (int i = 0; i < screen_->nmode; ++i) {
     const XRRModeInfo& info = screen_->modes[i];
@@ skipping 10 matching lines @@
                      info.modeFlags & RR_Interlace, refresh_rate, info.id)));
   }
 }
 
 DisplaySnapshotX11* NativeDisplayDelegateX11::InitDisplaySnapshot(
     RROutput output,
     XRROutputInfo* info,
     std::set<RRCrtc>* last_used_crtcs,
     int index) {
   int64_t display_id = 0;
-  display::EDIDParserX11 edid_parser(output);
+  EDIDParserX11 edid_parser(output);
   if (!edid_parser.GetDisplayId(static_cast<uint8_t>(index), &display_id))
     display_id = index;
 
   bool has_overscan = false;
   edid_parser.GetOutputOverscanFlag(&has_overscan);
 
   DisplayConnectionType type = GetDisplayConnectionTypeFromName(info->name);
   if (type == DISPLAY_CONNECTION_TYPE_UNKNOWN)
     LOG(ERROR) << "Unknown link type: " << info->name;
 
@@ skipping 293 matching lines @@
 
 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.
   return NULL;
 }
 
 bool NativeDisplayDelegateX11::SetColorCorrection(
-    const ui::DisplaySnapshot& output,
+    const DisplaySnapshot& output,
     const std::vector<GammaRampRGBEntry>& degamma_lut,
     const std::vector<GammaRampRGBEntry>& gamma_lut,
     const std::vector<float>& correction_matrix) {
   NOTIMPLEMENTED();
   return false;
 }
 
 void NativeDisplayDelegateX11::DrawBackground() {
   if (!background_color_argb_)
     return;
@@ skipping 12 matching lines @@
   GC gc = XCreateGC(display_, window_, 0, 0);
   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
+}  // namespace display