| 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_MANAGER_TEST_API_H_ | 5 #ifndef UI_DISPLAY_TEST_MANAGER_TEST_API_H_ |
| 6 #define UI_DISPLAY_TEST_MANAGER_TEST_API_H_ | 6 #define UI_DISPLAY_TEST_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 Point; | 21 class Point; |
| 21 class Size; | 22 class Size; |
| 22 } | 23 } |
| 23 | 24 |
| 24 namespace ui { | 25 namespace ui { |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 const std::vector<ui::ColorCalibrationProfile>& profiles); | 58 const std::vector<ui::ColorCalibrationProfile>& profiles); |
| 58 | 59 |
| 59 // Gets the internal display::ManagedDisplayInfo for a specific display id. | 60 // Gets the internal display::ManagedDisplayInfo for a specific display id. |
| 60 const display::ManagedDisplayInfo& GetInternalManagedDisplayInfo( | 61 const display::ManagedDisplayInfo& GetInternalManagedDisplayInfo( |
| 61 int64_t display_id); | 62 int64_t display_id); |
| 62 | 63 |
| 63 // Sets the UI scale for the |display_id|. Returns false if the | 64 // Sets the UI scale for the |display_id|. Returns false if the |
| 64 // display_id is not an internal display. | 65 // display_id is not an internal display. |
| 65 bool SetDisplayUIScale(int64_t display_id, float scale); | 66 bool SetDisplayUIScale(int64_t display_id, float scale); |
| 66 | 67 |
| 68 // Sets the touch support for |display_id|. |
| 69 void SetTouchSupport(int64_t display_id, |
| 70 display::Display::TouchSupport touch_support); |
| 71 |
| 67 private: | 72 private: |
| 68 friend class ScopedSetInternalDisplayId; | 73 friend class ScopedSetInternalDisplayId; |
| 69 // Sets the display id for internal display and | 74 // Sets the display id for internal display and |
| 70 // update the display mode list if necessary. | 75 // update the display mode list if necessary. |
| 71 void SetInternalDisplayId(int64_t id); | 76 void SetInternalDisplayId(int64_t id); |
| 72 | 77 |
| 73 DisplayManager* display_manager_; // not owned | 78 DisplayManager* display_manager_; // not owned |
| 74 | 79 |
| 75 DISALLOW_COPY_AND_ASSIGN(DisplayManagerTestApi); | 80 DISALLOW_COPY_AND_ASSIGN(DisplayManagerTestApi); |
| 76 }; | 81 }; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 | 115 |
| 111 // Creates the DisplayIdList from ints. | 116 // Creates the DisplayIdList from ints. |
| 112 DISPLAY_EXPORT display::DisplayIdList CreateDisplayIdList2(int64_t id1, | 117 DISPLAY_EXPORT display::DisplayIdList CreateDisplayIdList2(int64_t id1, |
| 113 int64_t id2); | 118 int64_t id2); |
| 114 DISPLAY_EXPORT display::DisplayIdList CreateDisplayIdListN(size_t count, ...); | 119 DISPLAY_EXPORT display::DisplayIdList CreateDisplayIdListN(size_t count, ...); |
| 115 | 120 |
| 116 } // namespace test | 121 } // namespace test |
| 117 } // namespace display | 122 } // namespace display |
| 118 | 123 |
| 119 #endif // UI_DISPLAY_TEST_MANAGER_TEST_API_H_ | 124 #endif // UI_DISPLAY_TEST_MANAGER_TEST_API_H_ |
| OLD | NEW |