Move chromeos/display/* to ui/display/chromeos

ui/display/chromeos/x11/native_display_delegate_x11.h

 // 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.
 
-#ifndef CHROMEOS_DISPLAY_NATIVE_DISPLAY_DELEGATE_X11_H_
-#define CHROMEOS_DISPLAY_NATIVE_DISPLAY_DELEGATE_X11_H_
+#ifndef UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
+#define UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chromeos/display/native_display_delegate.h"
+#include "ui/display/chromeos/native_display_delegate.h"
 
 typedef XID Window;
 
 struct _XDisplay;
 typedef struct _XDisplay Display;
 struct _XRROutputInfo;
 typedef _XRROutputInfo XRROutputInfo;
 struct _XRRScreenResources;
 typedef _XRRScreenResources XRRScreenResources;
 
-namespace chromeos {
+namespace ui {
 
 class NativeDisplayEventDispatcherX11;
 
 class NativeDisplayDelegateX11 : public NativeDisplayDelegate {
  public:
   // Helper class that allows NativeDisplayEventDispatcherX11 and
   // NativeDisplayDelegateX11::MessagePumpObserverX11 to interact with this
   // class or with mocks in tests.
   class HelperDelegate {
    public:
@@ skipping 87 matching lines @@
 
   // Processes X11 display events that have no X11 window associated with it.
   scoped_ptr<MessagePumpObserverX11> message_pump_observer_;
 
   // List of observers waiting for display configuration change events.
   ObserverList<NativeDisplayObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeDisplayDelegateX11);
 };
 
-}  // namespace chromeos
+}  // namespace ui
 
-#endif  // CHROMEOS_DISPLAY_NATIVE_DISPLAY_DELEGATE_X11_H_
+#endif  // UI_DISPLAY_CHROMEOS_X11_NATIVE_DISPLAY_DELEGATE_X11_H_