summaryrefslogtreecommitdiffstats
path: root/components/mus/ws/test_utils.cc
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2016-03-15 16:49:59 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-15 23:51:27 +0000
commita120428fc3730dac6df8042c7e324cd797619c72 (patch)
treee1c445705be48d31c9dfd27583f5ff02b9cb5bda /components/mus/ws/test_utils.cc
parenta2b4112f23abd2a0d70a5607f753f8b507e9be7e (diff)
downloadchromium_src-a120428fc3730dac6df8042c7e324cd797619c72.zip
chromium_src-a120428fc3730dac6df8042c7e324cd797619c72.tar.gz
chromium_src-a120428fc3730dac6df8042c7e324cd797619c72.tar.bz2
Renames ConnectionManager to WindowServer
WindowServer makes a lot more sense in this context. BUG=none TEST=none R=ben@chromium.org TBR=ben@chromium.org Review URL: https://codereview.chromium.org/1806773002 Cr-Commit-Position: refs/heads/master@{#381352}
Diffstat (limited to 'components/mus/ws/test_utils.cc')
-rw-r--r--components/mus/ws/test_utils.cc19
1 files changed, 9 insertions, 10 deletions
diff --git a/components/mus/ws/test_utils.cc b/components/mus/ws/test_utils.cc
index 1418c27..87b517c 100644
--- a/components/mus/ws/test_utils.cc
+++ b/components/mus/ws/test_utils.cc
@@ -249,18 +249,18 @@ void TestWindowTreeBinding::SetIncomingMethodCallProcessingPaused(bool paused) {
is_paused_ = paused;
}
-// TestConnectionManagerDelegate ----------------------------------------------
+// TestWindowServerDelegate ----------------------------------------------
-TestConnectionManagerDelegate::TestConnectionManagerDelegate() {}
-TestConnectionManagerDelegate::~TestConnectionManagerDelegate() {}
+TestWindowServerDelegate::TestWindowServerDelegate() {}
+TestWindowServerDelegate::~TestWindowServerDelegate() {}
-void TestConnectionManagerDelegate::OnNoMoreDisplays() {
+void TestWindowServerDelegate::OnNoMoreDisplays() {
got_on_no_more_displays_ = true;
}
scoped_ptr<WindowTreeBinding>
-TestConnectionManagerDelegate::CreateWindowTreeBindingForEmbedAtWindow(
- ws::ConnectionManager* connection_manager,
+TestWindowServerDelegate::CreateWindowTreeBindingForEmbedAtWindow(
+ ws::WindowServer* window_server,
ws::WindowTree* tree,
mojom::WindowTreeRequest tree_request,
mojom::WindowTreeClientPtr client) {
@@ -269,14 +269,13 @@ TestConnectionManagerDelegate::CreateWindowTreeBindingForEmbedAtWindow(
return std::move(binding);
}
-void TestConnectionManagerDelegate::CreateDefaultDisplays() {
+void TestWindowServerDelegate::CreateDefaultDisplays() {
DCHECK(num_displays_to_create_);
- DCHECK(connection_manager_);
+ DCHECK(window_server_);
for (int i = 0; i < num_displays_to_create_; ++i) {
// Display manages its own lifetime.
- Display* display =
- new Display(connection_manager_, PlatformDisplayInitParams());
+ Display* display = new Display(window_server_, PlatformDisplayInitParams());
display->Init(nullptr);
}
}