| Index: ash/display/display_change_observer_chromeos.h
|
| diff --git a/ash/display/display_change_observer_chromeos.h b/ash/display/display_change_observer_chromeos.h
|
| index 2edcf9c9e98b15f4325229788244bcf2aa110447..31539ecb0d8ef3848a34d4d002896132aa4c71bd 100644
|
| --- a/ash/display/display_change_observer_chromeos.h
|
| +++ b/ash/display/display_change_observer_chromeos.h
|
| @@ -2,8 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H
|
| -#define ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H
|
| +#ifndef ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_
|
| +#define ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_
|
| +
|
| +#include <vector>
|
|
|
| #include "ash/ash_export.h"
|
| #include "ash/shell_observer.h"
|
| @@ -46,7 +48,8 @@ class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
|
| const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE;
|
|
|
| // Overriden from ui::InputDeviceEventObserver:
|
| - virtual void OnInputDeviceConfigurationChanged() OVERRIDE;
|
| + virtual void OnTouchscreenDeviceConfigurationChanged() OVERRIDE;
|
| + virtual void OnKeyboardDeviceConfigurationChanged() OVERRIDE;
|
|
|
| // Overriden from ShellObserver:
|
| virtual void OnAppTerminating() OVERRIDE;
|
| @@ -60,4 +63,4 @@ class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
|
|
|
| } // namespace ash
|
|
|
| -#endif // ASH_DISPLAY_AURA_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H
|
| +#endif // ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_
|
|
|