OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_MANAGER_H_ | 5 #ifndef ASH_DISPLAY_DISPLAY_MANAGER_H_ |
6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ | 6 #define ASH_DISPLAY_DISPLAY_MANAGER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 | 145 |
146 // Sets the work area's |insets| to the display given by |display_id|. | 146 // Sets the work area's |insets| to the display given by |display_id|. |
147 bool UpdateWorkAreaOfDisplay(int64 display_id, const gfx::Insets& insets); | 147 bool UpdateWorkAreaOfDisplay(int64 display_id, const gfx::Insets& insets); |
148 | 148 |
149 // Registers the overscan insets for the display of the specified ID. Note | 149 // Registers the overscan insets for the display of the specified ID. Note |
150 // that the insets size should be specified in DIP size. It also triggers the | 150 // that the insets size should be specified in DIP size. It also triggers the |
151 // display's bounds change. | 151 // display's bounds change. |
152 void SetOverscanInsets(int64 display_id, const gfx::Insets& insets_in_dip); | 152 void SetOverscanInsets(int64 display_id, const gfx::Insets& insets_in_dip); |
153 | 153 |
154 // Sets the display's rotation. | 154 // Sets the display's rotation. |
155 void SetDisplayRotation(int64 display_id, gfx::Display::Rotation rotation); | 155 void SetDisplayRotation(int64 display_id, |
| 156 gfx::Display::Rotation rotation, |
| 157 gfx::Display::RotationSource source); |
156 | 158 |
157 // Sets the display's ui scale. Returns true if it's successful, or | 159 // Sets the display's ui scale. Returns true if it's successful, or |
158 // false otherwise. TODO(mukai): remove this and merge into | 160 // false otherwise. TODO(mukai): remove this and merge into |
159 // SetDisplayMode. | 161 // SetDisplayMode. |
160 bool SetDisplayUIScale(int64 display_id, float ui_scale); | 162 bool SetDisplayUIScale(int64 display_id, float ui_scale); |
161 | 163 |
162 // Sets the display's resolution. | 164 // Sets the display's resolution. |
163 // TODO(mukai): remove this and merge into SetDisplayMode. | 165 // TODO(mukai): remove this and merge into SetDisplayMode. |
164 void SetDisplayResolution(int64 display_id, const gfx::Size& resolution); | 166 void SetDisplayResolution(int64 display_id, const gfx::Size& resolution); |
165 | 167 |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
400 gfx::Display::Rotation registered_internal_display_rotation_; | 402 gfx::Display::Rotation registered_internal_display_rotation_; |
401 | 403 |
402 base::WeakPtrFactory<DisplayManager> weak_ptr_factory_; | 404 base::WeakPtrFactory<DisplayManager> weak_ptr_factory_; |
403 | 405 |
404 DISALLOW_COPY_AND_ASSIGN(DisplayManager); | 406 DISALLOW_COPY_AND_ASSIGN(DisplayManager); |
405 }; | 407 }; |
406 | 408 |
407 } // namespace ash | 409 } // namespace ash |
408 | 410 |
409 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ | 411 #endif // ASH_DISPLAY_DISPLAY_MANAGER_H_ |
OLD | NEW |