OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_CONFIGURATION_CONTROLLER_H_ | 5 #ifndef ASH_DISPLAY_DISPLAY_CONFIGURATION_CONTROLLER_H_ |
6 #define ASH_DISPLAY_DISPLAY_CONFIGURATION_CONTROLLER_H_ | 6 #define ASH_DISPLAY_DISPLAY_CONFIGURATION_CONTROLLER_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
45 void SetDisplayLayout(std::unique_ptr<display::DisplayLayout> layout, | 45 void SetDisplayLayout(std::unique_ptr<display::DisplayLayout> layout, |
46 bool user_action); | 46 bool user_action); |
47 | 47 |
48 // Sets the mirror mode with a fade-in/fade-out animation. Affects all | 48 // Sets the mirror mode with a fade-in/fade-out animation. Affects all |
49 // displays. | 49 // displays. |
50 void SetMirrorMode(bool mirror, bool user_action); | 50 void SetMirrorMode(bool mirror, bool user_action); |
51 | 51 |
52 // Sets the display's rotation with animation if available. | 52 // Sets the display's rotation with animation if available. |
53 void SetDisplayRotation(int64_t display_id, | 53 void SetDisplayRotation(int64_t display_id, |
54 display::Display::Rotation rotation, | 54 display::Display::Rotation rotation, |
55 display::Display::RotationSource source, | 55 display::Display::RotationSource source); |
56 bool user_action); | |
bruthig
2017/02/28 22:49:22
Thx for removing this.
| |
57 | 56 |
58 // Sets the primary display id. | 57 // Sets the primary display id. |
59 void SetPrimaryDisplayId(int64_t display_id, bool user_action); | 58 void SetPrimaryDisplayId(int64_t display_id, bool user_action); |
60 | 59 |
61 // WindowTreeHostManager::Observer | 60 // WindowTreeHostManager::Observer |
62 void OnDisplayConfigurationChanged() override; | 61 void OnDisplayConfigurationChanged() override; |
63 | 62 |
64 protected: | 63 protected: |
65 friend class ash::test::ShellTestApi; | 64 friend class ash::test::ShellTestApi; |
66 | 65 |
(...skipping 17 matching lines...) Expand all Loading... | |
84 std::unique_ptr<DisplayChangeLimiter> limiter_; | 83 std::unique_ptr<DisplayChangeLimiter> limiter_; |
85 | 84 |
86 base::WeakPtrFactory<DisplayConfigurationController> weak_ptr_factory_; | 85 base::WeakPtrFactory<DisplayConfigurationController> weak_ptr_factory_; |
87 | 86 |
88 DISALLOW_COPY_AND_ASSIGN(DisplayConfigurationController); | 87 DISALLOW_COPY_AND_ASSIGN(DisplayConfigurationController); |
89 }; | 88 }; |
90 | 89 |
91 } // namespace ash | 90 } // namespace ash |
92 | 91 |
93 #endif // ASH_DISPLAY_DISPLAY_CONFIGURATION_CONTROLLER_H_ | 92 #endif // ASH_DISPLAY_DISPLAY_CONFIGURATION_CONTROLLER_H_ |
OLD | NEW |