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

Side by Side Diff: ash/mus/window_manager_unittest.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase 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 unified diff | Download patch
« no previous file with comments | « ash/mus/window_manager_application.cc ('k') | ash/touch_hud/mus/BUILD.gn » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <memory> 5 #include <memory>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "services/shell/public/cpp/service_test.h" 9 #include "services/service_manager/public/cpp/service_test.h"
10 #include "services/ui/public/cpp/window.h" 10 #include "services/ui/public/cpp/window.h"
11 #include "services/ui/public/cpp/window_tree_client.h" 11 #include "services/ui/public/cpp/window_tree_client.h"
12 #include "services/ui/public/cpp/window_tree_client_delegate.h" 12 #include "services/ui/public/cpp/window_tree_client_delegate.h"
13 #include "services/ui/public/interfaces/window_tree.mojom.h" 13 #include "services/ui/public/interfaces/window_tree.mojom.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace mus { 16 namespace mus {
17 17
18 class WindowTreeClientDelegate : public ui::WindowTreeClientDelegate { 18 class WindowTreeClientDelegate : public ui::WindowTreeClientDelegate {
19 public: 19 public:
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 auto tree_client_request = GetProxy(&tree_client); 66 auto tree_client_request = GetProxy(&tree_client);
67 child_window->Embed(std::move(tree_client), base::Bind(&OnEmbed)); 67 child_window->Embed(std::move(tree_client), base::Bind(&OnEmbed));
68 std::unique_ptr<ui::WindowTreeClient> child_client(new ui::WindowTreeClient( 68 std::unique_ptr<ui::WindowTreeClient> child_client(new ui::WindowTreeClient(
69 &window_tree_delegate, nullptr, std::move(tree_client_request))); 69 &window_tree_delegate, nullptr, std::move(tree_client_request)));
70 child_client->WaitForEmbed(); 70 child_client->WaitForEmbed();
71 ASSERT_TRUE(!child_client->GetRoots().empty()); 71 ASSERT_TRUE(!child_client->GetRoots().empty());
72 } 72 }
73 73
74 } // namespace mus 74 } // namespace mus
75 } // namespace ash 75 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/window_manager_application.cc ('k') | ash/touch_hud/mus/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698