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

Side by Side Diff: components/mus/ws/window_manager_client_apptest.cc

Issue 1687693002: Rename ConnectToService to ConnectToInterface() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sp2
Patch Set: . Created 4 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 const EmbedResult result(embed_details_->connection, 268 const EmbedResult result(embed_details_->connection,
269 embed_details_->connection_id); 269 embed_details_->connection_id);
270 embed_details_.reset(); 270 embed_details_.reset();
271 return result; 271 return result;
272 } 272 }
273 273
274 // Establishes a connection to this application and asks for a 274 // Establishes a connection to this application and asks for a
275 // WindowTreeClient. 275 // WindowTreeClient.
276 mus::mojom::WindowTreeClientPtr ConnectAndGetWindowServerClient() { 276 mus::mojom::WindowTreeClientPtr ConnectAndGetWindowServerClient() {
277 mus::mojom::WindowTreeClientPtr client; 277 mus::mojom::WindowTreeClientPtr client;
278 shell()->ConnectToService(shell_url(), &client); 278 shell()->ConnectToInterface(shell_url(), &client);
279 return client; 279 return client;
280 } 280 }
281 281
282 // WindowServerTestBase: 282 // WindowServerTestBase:
283 void OnEmbed(Window* root) override { 283 void OnEmbed(Window* root) override {
284 if (!embed_details_) { 284 if (!embed_details_) {
285 WindowServerTestBase::OnEmbed(root); 285 WindowServerTestBase::OnEmbed(root);
286 return; 286 return;
287 } 287 }
288 288
(...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
1166 ASSERT_TRUE(window_in_wm); 1166 ASSERT_TRUE(window_in_wm);
1167 1167
1168 // Change the bounds in the wm, and make sure the child sees it. 1168 // Change the bounds in the wm, and make sure the child sees it.
1169 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101)); 1169 window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101));
1170 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection)); 1170 ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection));
1171 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds()); 1171 EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds());
1172 } 1172 }
1173 1173
1174 } // namespace ws 1174 } // namespace ws
1175 } // namespace mus 1175 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/public/cpp/lib/window_tree_host_factory.cc ('k') | components/mus/ws/window_tree_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698