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 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 | 39 |
40 // ui::DisplayConfigurator::StateController overrides: | 40 // ui::DisplayConfigurator::StateController overrides: |
41 ui::MultipleDisplayState GetStateForDisplayIds( | 41 ui::MultipleDisplayState GetStateForDisplayIds( |
42 const std::vector<int64>& outputs) const override; | 42 const std::vector<int64>& outputs) const override; |
43 bool GetResolutionForDisplayId(int64 display_id, | 43 bool GetResolutionForDisplayId(int64 display_id, |
44 gfx::Size* size) const override; | 44 gfx::Size* size) const override; |
45 | 45 |
46 // Overriden from ui::DisplayConfigurator::Observer: | 46 // Overriden from ui::DisplayConfigurator::Observer: |
47 void OnDisplayModeChanged( | 47 void OnDisplayModeChanged( |
48 const ui::DisplayConfigurator::DisplayStateList& outputs) override; | 48 const ui::DisplayConfigurator::DisplayStateList& outputs) override; |
| 49 void OnDisplayModeChangeFailed( |
| 50 const ui::DisplayConfigurator::DisplayStateList& displays, |
| 51 ui::MultipleDisplayState failed_new_state) override; |
49 | 52 |
50 // Overriden from ui::InputDeviceEventObserver: | 53 // Overriden from ui::InputDeviceEventObserver: |
51 void OnTouchscreenDeviceConfigurationChanged() override; | 54 void OnTouchscreenDeviceConfigurationChanged() override; |
52 void OnKeyboardDeviceConfigurationChanged() override; | 55 void OnKeyboardDeviceConfigurationChanged() override; |
53 void OnMouseDeviceConfigurationChanged() override; | 56 void OnMouseDeviceConfigurationChanged() override; |
54 void OnTouchpadDeviceConfigurationChanged() override; | 57 void OnTouchpadDeviceConfigurationChanged() override; |
55 | 58 |
56 // Overriden from ShellObserver: | 59 // Overriden from ShellObserver: |
57 void OnAppTerminating() override; | 60 void OnAppTerminating() override; |
58 | 61 |
59 // Exposed for testing. | 62 // Exposed for testing. |
60 ASH_EXPORT static float FindDeviceScaleFactor(float dpi); | 63 ASH_EXPORT static float FindDeviceScaleFactor(float dpi); |
61 | 64 |
62 private: | 65 private: |
63 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver); | 66 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver); |
64 }; | 67 }; |
65 | 68 |
66 } // namespace ash | 69 } // namespace ash |
67 | 70 |
68 #endif // ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_ | 71 #endif // ASH_DISPLAY_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H_ |
OLD | NEW |