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

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

Issue 2118083002: ShellClient -> Service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus2
Patch Set: . Created 4 years, 5 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
« no previous file with comments | « services/ui/public/cpp/tests/window_server_test_base.h ('k') | services/ui/service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/window_server_test_base.h" 5 #include "services/ui/public/cpp/tests/window_server_test_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 void WindowServerTestBase::SetUp() { 67 void WindowServerTestBase::SetUp() {
68 WindowServerShellTestBase::SetUp(); 68 WindowServerShellTestBase::SetUp();
69 69
70 CreateWindowTreeHost(connector(), this, &host_, this); 70 CreateWindowTreeHost(connector(), this, &host_, this);
71 71
72 ASSERT_TRUE(DoRunLoopWithTimeout()); // RunLoop should be quit by OnEmbed(). 72 ASSERT_TRUE(DoRunLoopWithTimeout()); // RunLoop should be quit by OnEmbed().
73 std::swap(window_manager_, most_recent_client_); 73 std::swap(window_manager_, most_recent_client_);
74 } 74 }
75 75
76 bool WindowServerTestBase::AcceptConnection(shell::Connection* connection) { 76 bool WindowServerTestBase::OnConnect(shell::Connection* connection) {
77 connection->AddInterface<mojom::WindowTreeClient>(this); 77 connection->AddInterface<mojom::WindowTreeClient>(this);
78 return true; 78 return true;
79 } 79 }
80 80
81 void WindowServerTestBase::OnEmbed(Window* root) { 81 void WindowServerTestBase::OnEmbed(Window* root) {
82 most_recent_client_ = root->window_tree(); 82 most_recent_client_ = root->window_tree();
83 EXPECT_TRUE(QuitRunLoop()); 83 EXPECT_TRUE(QuitRunLoop());
84 ASSERT_TRUE(window_manager_client_); 84 ASSERT_TRUE(window_manager_client_);
85 window_manager_client_->AddActivationParent(root); 85 window_manager_client_->AddActivationParent(root);
86 } 86 }
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 if (window_manager_delegate_) 135 if (window_manager_delegate_)
136 window_manager_delegate_->OnAccelerator(id, event); 136 window_manager_delegate_->OnAccelerator(id, event);
137 } 137 }
138 138
139 void WindowServerTestBase::Create(shell::Connection* connection, 139 void WindowServerTestBase::Create(shell::Connection* connection,
140 mojom::WindowTreeClientRequest request) { 140 mojom::WindowTreeClientRequest request) {
141 new WindowTreeClient(this, nullptr, std::move(request)); 141 new WindowTreeClient(this, nullptr, std::move(request));
142 } 142 }
143 143
144 } // namespace ui 144 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/public/cpp/tests/window_server_test_base.h ('k') | services/ui/service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698