| 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 UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_ | 5 #ifndef UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_ |
| 6 #define UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_ | 6 #define UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "ui/display/display.h" |
| 15 #include "ui/display/display_export.h" | 16 #include "ui/display/display_export.h" |
| 16 #include "ui/display/manager/display_layout.h" | 17 #include "ui/display/manager/display_layout.h" |
| 17 #include "ui/display/types/display_constants.h" | 18 #include "ui/display/types/display_constants.h" |
| 18 | 19 |
| 19 namespace gfx { | 20 namespace gfx { |
| 20 class Size; | 21 class Size; |
| 21 } | 22 } |
| 22 | 23 |
| 23 namespace display { | 24 namespace display { |
| 24 class DisplayManager; | 25 class DisplayManager; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 49 int64_t display_id, | 50 int64_t display_id, |
| 50 const std::vector<ui::ColorCalibrationProfile>& profiles); | 51 const std::vector<ui::ColorCalibrationProfile>& profiles); |
| 51 | 52 |
| 52 // Gets the internal ManagedDisplayInfo for a specific display id. | 53 // Gets the internal ManagedDisplayInfo for a specific display id. |
| 53 const ManagedDisplayInfo& GetInternalManagedDisplayInfo(int64_t display_id); | 54 const ManagedDisplayInfo& GetInternalManagedDisplayInfo(int64_t display_id); |
| 54 | 55 |
| 55 // Sets the UI scale for the |display_id|. Returns false if the | 56 // Sets the UI scale for the |display_id|. Returns false if the |
| 56 // display_id is not an internal display. | 57 // display_id is not an internal display. |
| 57 bool SetDisplayUIScale(int64_t display_id, float scale); | 58 bool SetDisplayUIScale(int64_t display_id, float scale); |
| 58 | 59 |
| 60 // Sets the touch support for |display_id|. |
| 61 void SetTouchSupport(int64_t display_id, |
| 62 display::Display::TouchSupport touch_support); |
| 63 |
| 59 private: | 64 private: |
| 60 friend class ScopedSetInternalDisplayId; | 65 friend class ScopedSetInternalDisplayId; |
| 61 // Sets the display id for internal display and | 66 // Sets the display id for internal display and |
| 62 // update the display mode list if necessary. | 67 // update the display mode list if necessary. |
| 63 void SetInternalDisplayId(int64_t id); | 68 void SetInternalDisplayId(int64_t id); |
| 64 | 69 |
| 65 DisplayManager* display_manager_; // not owned | 70 DisplayManager* display_manager_; // not owned |
| 66 | 71 |
| 67 DISALLOW_COPY_AND_ASSIGN(DisplayManagerTestApi); | 72 DISALLOW_COPY_AND_ASSIGN(DisplayManagerTestApi); |
| 68 }; | 73 }; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 int offset); | 106 int offset); |
| 102 | 107 |
| 103 // Creates the DisplayIdList from ints. | 108 // Creates the DisplayIdList from ints. |
| 104 DISPLAY_EXPORT DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2); | 109 DISPLAY_EXPORT DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2); |
| 105 DISPLAY_EXPORT DisplayIdList CreateDisplayIdListN(size_t count, ...); | 110 DISPLAY_EXPORT DisplayIdList CreateDisplayIdListN(size_t count, ...); |
| 106 | 111 |
| 107 } // namespace test | 112 } // namespace test |
| 108 } // namespace display | 113 } // namespace display |
| 109 | 114 |
| 110 #endif // UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_ | 115 #endif // UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_ |
| OLD | NEW |