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 "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
9 #include "ash/shell_observer.h" | 9 #include "ash/shell_observer.h" |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 | 30 |
31 // Returns the resolution list. | 31 // Returns the resolution list. |
32 ASH_EXPORT static std::vector<DisplayMode> GetExternalDisplayModeList( | 32 ASH_EXPORT static std::vector<DisplayMode> GetExternalDisplayModeList( |
33 const ui::DisplayConfigurator::DisplayState& output); | 33 const ui::DisplayConfigurator::DisplayState& output); |
34 | 34 |
35 DisplayChangeObserver(); | 35 DisplayChangeObserver(); |
36 virtual ~DisplayChangeObserver(); | 36 virtual ~DisplayChangeObserver(); |
37 | 37 |
38 // ui::DisplayConfigurator::StateController overrides: | 38 // ui::DisplayConfigurator::StateController overrides: |
39 virtual ui::MultipleDisplayState GetStateForDisplayIds( | 39 virtual ui::MultipleDisplayState GetStateForDisplayIds( |
40 const std::vector<int64>& outputs) const OVERRIDE; | 40 const std::vector<int64>& outputs) const override; |
41 virtual bool GetResolutionForDisplayId(int64 display_id, | 41 virtual bool GetResolutionForDisplayId(int64 display_id, |
42 gfx::Size* size) const OVERRIDE; | 42 gfx::Size* size) const override; |
43 | 43 |
44 // Overriden from ui::DisplayConfigurator::Observer: | 44 // Overriden from ui::DisplayConfigurator::Observer: |
45 virtual void OnDisplayModeChanged( | 45 virtual void OnDisplayModeChanged( |
46 const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE; | 46 const ui::DisplayConfigurator::DisplayStateList& outputs) override; |
47 | 47 |
48 // Overriden from ui::InputDeviceEventObserver: | 48 // Overriden from ui::InputDeviceEventObserver: |
49 virtual void OnInputDeviceConfigurationChanged() OVERRIDE; | 49 virtual void OnInputDeviceConfigurationChanged() override; |
50 | 50 |
51 // Overriden from ShellObserver: | 51 // Overriden from ShellObserver: |
52 virtual void OnAppTerminating() OVERRIDE; | 52 virtual void OnAppTerminating() override; |
53 | 53 |
54 // Exposed for testing. | 54 // Exposed for testing. |
55 ASH_EXPORT static float FindDeviceScaleFactor(float dpi); | 55 ASH_EXPORT static float FindDeviceScaleFactor(float dpi); |
56 | 56 |
57 private: | 57 private: |
58 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver); | 58 DISALLOW_COPY_AND_ASSIGN(DisplayChangeObserver); |
59 }; | 59 }; |
60 | 60 |
61 } // namespace ash | 61 } // namespace ash |
62 | 62 |
63 #endif // ASH_DISPLAY_AURA_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H | 63 #endif // ASH_DISPLAY_AURA_DISPLAY_CHANGE_OBSERVER_CHROMEOS_H |
OLD | NEW |