| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H | 5 #ifndef ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_ |
| 6 #define ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H | 6 #define ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_ |
| 7 |
| 8 #include <vector> |
| 7 | 9 |
| 8 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 9 #include "ash/shell_observer.h" | 11 #include "ash/shell_observer.h" |
| 10 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
| 11 #include "ui/display/chromeos/display_configurator.h" | 13 #include "ui/display/chromeos/display_configurator.h" |
| 12 #include "ui/events/input_device_event_observer.h" | 14 #include "ui/events/input_device_event_observer.h" |
| 13 | 15 |
| 14 namespace ash { | 16 namespace ash { |
| 15 | 17 |
| 16 class DisplayInfo; | 18 class DisplayInfo; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 39 virtual ui::MultipleDisplayState GetStateForDisplayIds( | 41 virtual ui::MultipleDisplayState GetStateForDisplayIds( |
| 40 const std::vector<int64>& outputs) const override; | 42 const std::vector<int64>& outputs) const override; |
| 41 virtual bool GetResolutionForDisplayId(int64 display_id, | 43 virtual bool GetResolutionForDisplayId(int64 display_id, |
| 42 gfx::Size* size) const override; | 44 gfx::Size* size) const override; |
| 43 | 45 |
| 44 // Overriden from ui::DisplayConfigurator::Observer: | 46 // Overriden from ui::DisplayConfigurator::Observer: |
| 45 virtual void OnDisplayModeChanged( | 47 virtual void OnDisplayModeChanged( |
| 46 const ui::DisplayConfigurator::DisplayStateList& outputs) override; | 48 const ui::DisplayConfigurator::DisplayStateList& outputs) override; |
| 47 | 49 |
| 48 // Overriden from ui::InputDeviceEventObserver: | 50 // Overriden from ui::InputDeviceEventObserver: |
| 49 virtual void OnInputDeviceConfigurationChanged() override; | 51 virtual void OnTouchscreenDeviceConfigurationChanged() override; |
| 52 virtual void OnKeyboardDeviceConfigurationChanged() override; |
| 50 | 53 |
| 51 // Overriden from ShellObserver: | 54 // Overriden from ShellObserver: |
| 52 virtual void OnAppTerminating() override; | 55 virtual void OnAppTerminating() override; |
| 53 | 56 |
| 54 // Exposed for testing. | 57 // Exposed for testing. |
| 55 ASH_EXPORT static float FindDeviceScaleFactor(float dpi); | 58 ASH_EXPORT static float FindDeviceScaleFactor(float dpi); |
| 56 | 59 |
| 57 private: | 60 private: |
| 58 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver); | 61 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver); |
| 59 }; | 62 }; |
| 60 | 63 |
| 61 } // namespace ash | 64 } // namespace ash |
| 62 | 65 |
| 63 #endif // ASH_DISPLAY_AURA_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H | 66 #endif // ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_ |
| OLD | NEW |