Refactoring display configuration state to allow generic state objects

ui/display/chromeos/x11/native_display_event_dispatcher_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_EVENT_DISPATCHER_X11_H_
-#define CHROMEOS_DISPLAY_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_
+#ifndef UI_DISPLAY_CHROMEOS_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_
+#define UI_DISPLAY_CHROMEOS_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_
 
 #include "base/message_loop/message_pump_dispatcher.h"
-#include "chromeos/display/native_display_delegate_x11.h"
+#include "ui/display/chromeos/x11/native_display_delegate_x11.h"
+#include "ui/display/display_export.h"
 
-namespace chromeos {
+namespace ui {
 
-class CHROMEOS_EXPORT NativeDisplayEventDispatcherX11
+class DISPLAY_EXPORT NativeDisplayEventDispatcherX11
     : public base::MessagePumpDispatcher {
  public:
   NativeDisplayEventDispatcherX11(
       NativeDisplayDelegateX11::HelperDelegate* delegate,
       int xrandr_event_base);
   virtual ~NativeDisplayEventDispatcherX11();
 
   // base::MessagePumpDispatcher overrides:
   //
   // Called when an RRNotify event is received.  The implementation is
   // interested in the cases of RRNotify events which correspond to output
   // add/remove events.  Note that Output add/remove events are sent in response
   // to our own reconfiguration operations so spurious events are common.
   // Spurious events will have no effect.
   virtual uint32_t Dispatch(const base::NativeEvent& event) OVERRIDE;
 
  private:
   NativeDisplayDelegateX11::HelperDelegate* delegate_;  // Not owned.
 
   // The base of the event numbers used to represent XRandr events used in
   // decoding events regarding output add/remove.
   int xrandr_event_base_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeDisplayEventDispatcherX11);
 };
 
-}  // namespace chromeos
+}  // namespace ui
 
-#endif  // CHROMEOS_DISPLAY_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_
+#endif  // UI_DISPLAY_CHROMEOS_NATIVE_DISPLAY_EVENT_DISPATCHER_X11_H_