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

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

Issue 1681813002: Rename Connection::AddService/ConnectToService to Connection::AddInterface/GetInterface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@interface_binder
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/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 ASSERT_GT((*changes1())[0].connection_id, 0); 586 ASSERT_GT((*changes1())[0].connection_id, 0);
587 connection_id_1_ = (*changes1())[0].connection_id; 587 connection_id_1_ = (*changes1())[0].connection_id;
588 ASSERT_FALSE((*changes1())[0].windows.empty()); 588 ASSERT_FALSE((*changes1())[0].windows.empty());
589 root_window_id_ = (*changes1())[0].windows[0].window_id; 589 root_window_id_ = (*changes1())[0].windows[0].window_id;
590 ASSERT_EQ(root_window_id_, ws_client1_->root_window_id()); 590 ASSERT_EQ(root_window_id_, ws_client1_->root_window_id());
591 changes1()->clear(); 591 changes1()->clear();
592 } 592 }
593 593
594 // mojo::ShellClient implementation. 594 // mojo::ShellClient implementation.
595 bool AcceptConnection(Connection* connection) override { 595 bool AcceptConnection(Connection* connection) override {
596 connection->AddService(client_factory_.get()); 596 connection->AddInterface(client_factory_.get());
597 return true; 597 return true;
598 } 598 }
599 599
600 scoped_ptr<TestWindowTreeClientImpl> ws_client1_; 600 scoped_ptr<TestWindowTreeClientImpl> ws_client1_;
601 scoped_ptr<TestWindowTreeClientImpl> ws_client2_; 601 scoped_ptr<TestWindowTreeClientImpl> ws_client2_;
602 scoped_ptr<TestWindowTreeClientImpl> ws_client3_; 602 scoped_ptr<TestWindowTreeClientImpl> ws_client3_;
603 603
604 mojom::WindowTreeHostPtr host_; 604 mojom::WindowTreeHostPtr host_;
605 605
606 private: 606 private:
(...skipping 1257 matching lines...) Expand 10 before | Expand all | Expand 10 after
1864 // originating connection. 1864 // originating connection.
1865 1865
1866 // TODO(sky): make sure coverage of what was 1866 // TODO(sky): make sure coverage of what was
1867 // WindowManagerTest.SecondEmbedRoot_InitService and 1867 // WindowManagerTest.SecondEmbedRoot_InitService and
1868 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window 1868 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
1869 // manager 1869 // manager
1870 // tests. 1870 // tests.
1871 1871
1872 } // namespace ws 1872 } // namespace ws
1873 } // namespace mus 1873 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/public/cpp/tests/window_server_test_base.cc ('k') | components/pdf_viewer/pdf_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698