Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Side by Side Diff: ash/test/display_manager_test_api.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
oshima 2016/04/08 07:09:42 include?
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "ui/display/manager/display_layout.h" 14 #include "ui/display/manager/display_layout.h"
15 #include "ui/display/types/display_constants.h" 15 #include "ui/display/types/display_constants.h"
16 16
17 namespace gfx { 17 namespace gfx {
18 class Point; 18 class Point;
19 class Size; 19 class Size;
20 } 20 }
21 21
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 bool SetDisplayResolution(int64_t display_id, const gfx::Size& resolution); 91 bool SetDisplayResolution(int64_t display_id, const gfx::Size& resolution);
92 92
93 // Swap the primary display with the secondary. 93 // Swap the primary display with the secondary.
94 void SwapPrimaryDisplay(); 94 void SwapPrimaryDisplay();
95 95
96 // Creates the dislpay layout from position and offset for the current 96 // Creates the dislpay layout from position and offset for the current
97 // display list. If you simply want to create a new layout that is 97 // display list. If you simply want to create a new layout that is
98 // independent of current displays, use DisplayLayoutBuilder or simply 98 // independent of current displays, use DisplayLayoutBuilder or simply
99 // create a new DisplayLayout and set display id fields (primary, ids 99 // create a new DisplayLayout and set display id fields (primary, ids
100 // in placement) manually. 100 // in placement) manually.
101 scoped_ptr<display::DisplayLayout> CreateDisplayLayout( 101 std::unique_ptr<display::DisplayLayout> CreateDisplayLayout(
102 display::DisplayPlacement::Position position, 102 display::DisplayPlacement::Position position,
103 int offset); 103 int offset);
104 104
105 // Creates the DisplayIdList from ints. 105 // Creates the DisplayIdList from ints.
106 display::DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2); 106 display::DisplayIdList CreateDisplayIdList2(int64_t id1, int64_t id2);
107 display::DisplayIdList CreateDisplayIdListN(size_t count, ...); 107 display::DisplayIdList CreateDisplayIdListN(size_t count, ...);
108 108
109 } // namespace test 109 } // namespace test
110 } // namespace ash 110 } // namespace ash
111 111
112 #endif // ASH_TEST_DISPLAY_MANAGER_TEST_API_H_ 112 #endif // ASH_TEST_DISPLAY_MANAGER_TEST_API_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698