| 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_TEST_DISPLAY_MANAGER_TEST_API_H_ | 5 #ifndef ASH_TEST_DISPLAY_MANAGER_TEST_API_H_ |
| 6 #define ASH_TEST_DISPLAY_MANAGER_TEST_API_H_ | 6 #define ASH_TEST_DISPLAY_MANAGER_TEST_API_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 // Update the display configuration as given in |display_specs|. The format of | 24 // Update the display configuration as given in |display_specs|. The format of |
| 25 // |display_spec| is a list of comma separated spec for each displays. Please | 25 // |display_spec| is a list of comma separated spec for each displays. Please |
| 26 // refer to the comment in |aura::DisplayManager::CreateDisplayFromSpec| for | 26 // refer to the comment in |aura::DisplayManager::CreateDisplayFromSpec| for |
| 27 // the format of the display spec. | 27 // the format of the display spec. |
| 28 void UpdateDisplay(const std::string& display_specs); | 28 void UpdateDisplay(const std::string& display_specs); |
| 29 | 29 |
| 30 // Set the 1st display as an internal display and returns the display Id for | 30 // Set the 1st display as an internal display and returns the display Id for |
| 31 // the internal display. | 31 // the internal display. |
| 32 int64 SetFirstDisplayAsInternalDisplay(); | 32 int64 SetFirstDisplayAsInternalDisplay(); |
| 33 | 33 |
| 34 // Don't update the display when the root window's size was changed. |
| 35 void DisableChangeDisplayUponHostResize(); |
| 36 |
| 34 private: | 37 private: |
| 35 internal::DisplayManager* display_manager_; // not owned | 38 internal::DisplayManager* display_manager_; // not owned |
| 36 | 39 |
| 37 DISALLOW_COPY_AND_ASSIGN(DisplayManagerTestApi); | 40 DISALLOW_COPY_AND_ASSIGN(DisplayManagerTestApi); |
| 38 }; | 41 }; |
| 39 | 42 |
| 40 } // namespace test | 43 } // namespace test |
| 41 } // namespace ash | 44 } // namespace ash |
| 42 | 45 |
| 43 #endif // ASH_TEST_DISPLAY_MANAGER_TEST_API_H_ | 46 #endif // ASH_TEST_DISPLAY_MANAGER_TEST_API_H_ |
| OLD | NEW |