| Index: ui/aura/display_change_observer_x11.h
|
| diff --git a/ui/aura/monitor_change_observer_x11.h b/ui/aura/display_change_observer_x11.h
|
| similarity index 60%
|
| rename from ui/aura/monitor_change_observer_x11.h
|
| rename to ui/aura/display_change_observer_x11.h
|
| index 416086043b3e9ff193999d933a7be946dad9b5b1..caf3be782f4f03dab190151710ea6310b996dc26 100644
|
| --- a/ui/aura/monitor_change_observer_x11.h
|
| +++ b/ui/aura/display_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_X11_H
|
| -#define UI_AURA_MONITOR_CHANGE_OBSERVER_X11_H
|
| +#ifndef UI_AURA_DISPLAY_CHANGE_OBSERVER_X11_H
|
| +#define UI_AURA_DISPLAY_CHANGE_OBSERVER_X11_H
|
| #pragma once
|
|
|
| #include <X11/Xlib.h>
|
| @@ -17,18 +17,18 @@
|
| namespace aura {
|
| namespace internal {
|
|
|
| -// An object that observes changes in monitor configuration and
|
| -// update MonitorManagers.
|
| -class MonitorChangeObserverX11 : public MessageLoop::Dispatcher {
|
| +// An object that observes changes in display configuration and
|
| +// update DisplayManagers.
|
| +class DisplayChangeObserverX11 : public MessageLoop::Dispatcher {
|
| public:
|
| - MonitorChangeObserverX11();
|
| - virtual ~MonitorChangeObserverX11();
|
| + DisplayChangeObserverX11();
|
| + virtual ~DisplayChangeObserverX11();
|
|
|
| // Overridden from Dispatcher overrides:
|
| virtual bool Dispatch(const base::NativeEvent& xev) OVERRIDE;
|
|
|
| // Reads display configurations from the system and notifies
|
| - // |monitor_manager_| about the change.
|
| + // |display_manager_| about the change.
|
| void NotifyDisplayChange();
|
|
|
| private:
|
| @@ -38,10 +38,10 @@ class MonitorChangeObserverX11 : public MessageLoop::Dispatcher {
|
|
|
| int xrandr_event_base_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(MonitorChangeObserverX11);
|
| + DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserverX11);
|
| };
|
|
|
| } // namespace internal
|
| } // namespace aura
|
|
|
| -#endif // UI_AURA_MONITOR_CHANGE_OBSERVER_X11_H
|
| +#endif // UI_AURA_DISPLAY_CHANGE_OBSERVER_X11_H
|
|
|