| Index: ash/monitor/monitor_change_observer_x11.h
|
| diff --git a/ui/aura/monitor_change_observer_x11.h b/ash/monitor/monitor_change_observer_x11.h
|
| similarity index 63%
|
| rename from ui/aura/monitor_change_observer_x11.h
|
| rename to ash/monitor/monitor_change_observer_x11.h
|
| index 1c4a323f10f7949c6a4047d5ba739b3b81d1c7ad..15569076c166e9a0dfee497b704f6686813bd896 100644
|
| --- a/ui/aura/monitor_change_observer_x11.h
|
| +++ b/ash/monitor/monitor_change_observer_x11.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_AURA_MONITOR_CHANGE_OBSERVER_H
|
| -#define UI_AURA_MONITOR_CHANGE_OBSERVER_H
|
| +#ifndef ASH_MONITOR_MONITOR_CHANGE_OBSERVER_X11_H
|
| +#define ASH_MONITOR_MONITOR_CHANGE_OBSERVER_X11_H
|
| #pragma once
|
|
|
| #include <X11/Xlib.h>
|
| @@ -12,18 +12,22 @@
|
| #undef RootWindow
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/message_loop.h"
|
| #include "ui/aura/aura_export.h"
|
|
|
| -namespace aura {
|
| +namespace ash {
|
| +namespace internal {
|
|
|
| // An object that observes changes in monitor configuration and
|
| // update MonitorManagers.
|
| -class AURA_EXPORT MonitorChangeObserverX11 {
|
| +class MonitorChangeObserverX11 : public MessageLoop::Dispatcher {
|
| public:
|
| MonitorChangeObserverX11();
|
| ~MonitorChangeObserverX11();
|
|
|
| - bool Dispatch(const XEvent* event);
|
| + // Overridden from Dispatcher overrides:
|
| + virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
|
| + XEvent* xev) OVERRIDE;
|
|
|
| // Reads monitor configurations from the system and notifies
|
| // |monitor_manager_| about the change.
|
| @@ -39,6 +43,7 @@ class AURA_EXPORT MonitorChangeObserverX11 {
|
| DISALLOW_COPY_AND_ASSIGN(MonitorChangeObserverX11);
|
| };
|
|
|
| +} // namespace internal
|
| } // namespace aura
|
|
|
| -#endif // UI_AURA_MONITOR_CHANGE_OBSERVER_H
|
| +#endif // ASH_MONITOR_MONITOR_CHANGE_OBSERVER_X11_H
|
|
|