| Index: ash/display/display_change_observer_x11.h
|
| diff --git a/ash/display/display_change_observer_x11.h b/ash/display/display_change_observer_x11.h
|
| index e0456fcb4c8229d20e1ee94898039e4ab059614f..f663fe06ab42accdbab1da6981d97c4fef1e8d2e 100644
|
| --- a/ash/display/display_change_observer_x11.h
|
| +++ b/ash/display/display_change_observer_x11.h
|
| @@ -18,11 +18,16 @@ namespace internal {
|
|
|
| // An object that observes changes in display configuration and
|
| // update DisplayManagers.
|
| -class DisplayChangeObserverX11 : public chromeos::OutputConfigurator::Observer {
|
| +class DisplayChangeObserverX11 : public chromeos::OutputConfigurator::Delegate,
|
| + public chromeos::OutputConfigurator::Observer {
|
| public:
|
| DisplayChangeObserverX11();
|
| virtual ~DisplayChangeObserverX11();
|
|
|
| + // chromeos::OutputConfigurator::Delegate overrides:
|
| + virtual chromeos::OutputState GetStateForOutputs(
|
| + const std::vector<RROutput>& outputs) const OVERRIDE;
|
| +
|
| // Overriden from chromeos::OutputConfigurator::Observer:
|
| virtual void OnDisplayModeChanged() OVERRIDE;
|
|
|
|
|