| Index: ui/display/test/display_manager_test_api.h
|
| diff --git a/ui/display/test/display_manager_test_api.h b/ui/display/test/display_manager_test_api.h
|
| index feb5efc4ab62c3865672d3d146a2c150de79ed24..e774ad9b4f529b051f8cbd144710e5ca075f7d0e 100644
|
| --- a/ui/display/test/display_manager_test_api.h
|
| +++ b/ui/display/test/display_manager_test_api.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_DISPLAY_TEST_MANAGER_TEST_API_H_
|
| -#define UI_DISPLAY_TEST_MANAGER_TEST_API_H_
|
| +#ifndef UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_
|
| +#define UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -49,9 +49,8 @@ class DISPLAY_EXPORT DisplayManagerTestApi {
|
| int64_t display_id,
|
| const std::vector<ui::ColorCalibrationProfile>& profiles);
|
|
|
| - // Gets the internal display::ManagedDisplayInfo for a specific display id.
|
| - const display::ManagedDisplayInfo& GetInternalManagedDisplayInfo(
|
| - int64_t display_id);
|
| + // Gets the internal ManagedDisplayInfo for a specific display id.
|
| + const ManagedDisplayInfo& GetInternalManagedDisplayInfo(int64_t display_id);
|
|
|
| // Sets the UI scale for the |display_id|. Returns false if the
|
| // display_id is not an internal display.
|
| @@ -96,17 +95,16 @@ DISPLAY_EXPORT bool SetDisplayResolution(DisplayManager* display_manager,
|
| // independent of current displays, use DisplayLayoutBuilder or simply
|
| // create a new DisplayLayout and set display id fields (primary, ids
|
| // in placement) manually.
|
| -DISPLAY_EXPORT std::unique_ptr<display::DisplayLayout> CreateDisplayLayout(
|
| +DISPLAY_EXPORT std::unique_ptr<DisplayLayout> CreateDisplayLayout(
|
| DisplayManager* display_manager,
|
| - display::DisplayPlacement::Position position,
|
| + DisplayPlacement::Position position,
|
| int offset);
|
|
|
| // Creates the DisplayIdList from ints.
|
| -DISPLAY_EXPORT display::DisplayIdList CreateDisplayIdList2(int64_t id1,
|
| - int64_t id2);
|
| -DISPLAY_EXPORT display::DisplayIdList CreateDisplayIdListN(size_t count, ...);
|
| +DISPLAY_EXPORT DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2);
|
| +DISPLAY_EXPORT DisplayIdList CreateDisplayIdListN(size_t count, ...);
|
|
|
| } // namespace test
|
| } // namespace display
|
|
|
| -#endif // UI_DISPLAY_TEST_MANAGER_TEST_API_H_
|
| +#endif // UI_DISPLAY_TEST_DISPLAY_MANAGER_TEST_API_H_
|
|
|