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

Side by Side Diff: services/ui/public/cpp/tests/test_window_tree_client_setup.cc

Issue 2322613002: Adds support for multiple displays to WmTestBase (Closed)
Patch Set: feedback Created 4 years, 3 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #include "services/ui/public/cpp/tests/test_window_tree_client_setup.h" 5 #include "services/ui/public/cpp/tests/test_window_tree_client_setup.h"
6 6
7 #include "services/ui/public/cpp/tests/test_window_tree.h" 7 #include "services/ui/public/cpp/tests/test_window_tree.h"
8 #include "services/ui/public/cpp/tests/window_tree_client_private.h" 8 #include "services/ui/public/cpp/tests/window_tree_client_private.h"
9 #include "services/ui/public/cpp/window_tree_client.h" 9 #include "services/ui/public/cpp/window_tree_client.h"
10 #include "ui/display/display.h" 10 #include "ui/display/display.h"
11 11
12 namespace ui { 12 namespace ui {
13 13
14 TestWindowTreeClientSetup::TestWindowTreeClientSetup() {} 14 TestWindowTreeClientSetup::TestWindowTreeClientSetup() {}
15 15
16 TestWindowTreeClientSetup::~TestWindowTreeClientSetup() {} 16 TestWindowTreeClientSetup::~TestWindowTreeClientSetup() {}
17 17
18 void TestWindowTreeClientSetup::Init( 18 void TestWindowTreeClientSetup::Init(
19 WindowTreeClientDelegate* window_tree_delegate) { 19 WindowTreeClientDelegate* window_tree_delegate) {
20 CommonInit(window_tree_delegate, nullptr); 20 CommonInit(window_tree_delegate, nullptr);
21 WindowTreeClientPrivate(window_tree_client_.get()) 21 WindowTreeClientPrivate(window_tree_client_.get())
22 .OnEmbed(window_tree_.get()); 22 .OnEmbed(window_tree_.get());
23 } 23 }
24 24
25 void TestWindowTreeClientSetup::InitForWindowManager( 25 void TestWindowTreeClientSetup::InitForWindowManager(
26 WindowTreeClientDelegate* window_tree_delegate, 26 WindowTreeClientDelegate* window_tree_delegate,
27 WindowManagerDelegate* window_manager_delegate, 27 WindowManagerDelegate* window_manager_delegate) {
28 const display::Display& display) {
29 CommonInit(window_tree_delegate, window_manager_delegate); 28 CommonInit(window_tree_delegate, window_manager_delegate);
30 WindowTreeClientPrivate(window_tree_client_.get()) 29 WindowTreeClientPrivate(window_tree_client_.get())
31 .SetTreeAndClientId(window_tree_.get(), 1); 30 .SetTreeAndClientId(window_tree_.get(), 1);
32 } 31 }
33 32
34 std::unique_ptr<WindowTreeClient> 33 std::unique_ptr<WindowTreeClient>
35 TestWindowTreeClientSetup::OwnWindowTreeClient() { 34 TestWindowTreeClientSetup::OwnWindowTreeClient() {
36 DCHECK(window_tree_client_); 35 DCHECK(window_tree_client_);
37 return std::move(window_tree_client_); 36 return std::move(window_tree_client_);
38 } 37 }
39 38
40 WindowTreeClient* TestWindowTreeClientSetup::window_tree_client() { 39 WindowTreeClient* TestWindowTreeClientSetup::window_tree_client() {
41 return window_tree_client_.get(); 40 return window_tree_client_.get();
42 } 41 }
43 42
44 void TestWindowTreeClientSetup::CommonInit( 43 void TestWindowTreeClientSetup::CommonInit(
45 WindowTreeClientDelegate* window_tree_delegate, 44 WindowTreeClientDelegate* window_tree_delegate,
46 WindowManagerDelegate* window_manager_delegate) { 45 WindowManagerDelegate* window_manager_delegate) {
47 window_tree_.reset(new TestWindowTree); 46 window_tree_.reset(new TestWindowTree);
48 window_tree_client_.reset(new WindowTreeClient( 47 window_tree_client_.reset(new WindowTreeClient(
49 window_tree_delegate, window_manager_delegate, nullptr)); 48 window_tree_delegate, window_manager_delegate, nullptr));
50 } 49 }
51 50
52 } // namespace ui 51 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698