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

Side by Side Diff: services/ui/ws/window_tree_client_unittest.cc

Issue 2215133002: Change signature of OnConnect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup
Patch Set: . Created 4 years, 4 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/test_ime/main.cc ('k') | services/user/user_shell_client.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 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/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 client->WaitForOnEmbed(); 578 client->WaitForOnEmbed();
579 579
580 EXPECT_EQ("OnEmbed", 580 EXPECT_EQ("OnEmbed",
581 SingleChangeToDescription(*client->tracker()->changes())); 581 SingleChangeToDescription(*client->tracker()->changes()));
582 if (client_id) 582 if (client_id)
583 *client_id = (*client->tracker()->changes())[0].client_id; 583 *client_id = (*client->tracker()->changes())[0].client_id;
584 return client; 584 return client;
585 } 585 }
586 586
587 // WindowServerServiceTestBase: 587 // WindowServerServiceTestBase:
588 bool OnConnect(shell::Connection* connection) override { 588 bool OnConnect(const shell::Identity& remote_identity,
589 connection->AddInterface(client_factory_.get()); 589 shell::InterfaceRegistry* registry) override {
590 registry->AddInterface(client_factory_.get());
590 return true; 591 return true;
591 } 592 }
592 593
593 void SetUp() override { 594 void SetUp() override {
594 client_factory_.reset(new WindowTreeClientFactory()); 595 client_factory_.reset(new WindowTreeClientFactory());
595 596
596 WindowServerServiceTestBase::SetUp(); 597 WindowServerServiceTestBase::SetUp();
597 598
598 mojom::WindowTreeHostFactoryPtr factory; 599 mojom::WindowTreeHostFactoryPtr factory;
599 connector()->ConnectToInterface("mojo:ui", &factory); 600 connector()->ConnectToInterface("mojo:ui", &factory);
(...skipping 1442 matching lines...) Expand 10 before | Expand all | Expand 10 after
2042 2043
2043 // TODO(sky): make sure coverage of what was 2044 // TODO(sky): make sure coverage of what was
2044 // WindowManagerTest.SecondEmbedRoot_InitService and 2045 // WindowManagerTest.SecondEmbedRoot_InitService and
2045 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window 2046 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
2046 // manager 2047 // manager
2047 // tests. 2048 // tests.
2048 2049
2049 } // namespace test 2050 } // namespace test
2050 } // namespace ws 2051 } // namespace ws
2051 } // namespace ui 2052 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/test_ime/main.cc ('k') | services/user/user_shell_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698