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

Unified Diff: services/ui/public/cpp/tests/window_server_test_base.cc

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/public/cpp/tests/window_server_test_base.h ('k') | services/ui/public/cpp/window_tree_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/public/cpp/tests/window_server_test_base.cc
diff --git a/services/ui/public/cpp/tests/window_server_test_base.cc b/services/ui/public/cpp/tests/window_server_test_base.cc
index a72cc2a144a44eda8706a0b8e20c18d0168b2777..4ee691ec6b22033906bfd4d90a2aa7632d9ff52a 100644
--- a/services/ui/public/cpp/tests/window_server_test_base.cc
+++ b/services/ui/public/cpp/tests/window_server_test_base.cc
@@ -89,8 +89,9 @@ void WindowServerTestBase::SetUp() {
ASSERT_TRUE(DoRunLoopWithTimeout()); // RunLoop should be quit by OnEmbed().
}
-bool WindowServerTestBase::OnConnect(const shell::Identity& remote_identity,
- shell::InterfaceRegistry* registry) {
+bool WindowServerTestBase::OnConnect(
+ const service_manager::Identity& remote_identity,
+ service_manager::InterfaceRegistry* registry) {
registry->AddInterface<mojom::WindowTreeClient>(this);
return true;
}
@@ -181,8 +182,9 @@ mojom::EventResult WindowServerTestBase::OnAccelerator(uint32_t accelerator_id,
: mojom::EventResult::UNHANDLED;
}
-void WindowServerTestBase::Create(const shell::Identity& remote_identity,
- mojom::WindowTreeClientRequest request) {
+void WindowServerTestBase::Create(
+ const service_manager::Identity& remote_identity,
+ mojom::WindowTreeClientRequest request) {
window_tree_clients_.insert(
base::MakeUnique<WindowTreeClient>(this, nullptr, std::move(request)));
}
« no previous file with comments | « services/ui/public/cpp/tests/window_server_test_base.h ('k') | services/ui/public/cpp/window_tree_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698