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

Side by Side Diff: services/ui/public/cpp/tests/window_server_test_base.h

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
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 #ifndef SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ 5 #ifndef SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_
6 #define SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ 6 #define SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "services/shell/public/cpp/interface_factory.h" 12 #include "services/service_manager/public/cpp/interface_factory.h"
13 #include "services/ui/public/cpp/tests/window_server_shelltest_base.h" 13 #include "services/ui/public/cpp/tests/window_server_shelltest_base.h"
14 #include "services/ui/public/cpp/window_manager_delegate.h" 14 #include "services/ui/public/cpp/window_manager_delegate.h"
15 #include "services/ui/public/cpp/window_tree_client_delegate.h" 15 #include "services/ui/public/cpp/window_tree_client_delegate.h"
16 #include "services/ui/public/interfaces/window_tree.mojom.h" 16 #include "services/ui/public/interfaces/window_tree.mojom.h"
17 #include "services/ui/public/interfaces/window_tree_host.mojom.h" 17 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
18 18
19 namespace ui { 19 namespace ui {
20 20
21 // WindowServerTestBase is a base class for use with shell tests that use 21 // WindowServerTestBase is a base class for use with shell tests that use
22 // WindowServer. SetUp() connects to the WindowServer and blocks until OnEmbed() 22 // WindowServer. SetUp() connects to the WindowServer and blocks until OnEmbed()
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 WindowManagerClient* window_manager_client_; 122 WindowManagerClient* window_manager_client_;
123 123
124 bool window_tree_client_lost_connection_ = false; 124 bool window_tree_client_lost_connection_ = false;
125 125
126 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); 126 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase);
127 }; 127 };
128 128
129 } // namespace ui 129 } // namespace ui
130 130
131 #endif // SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ 131 #endif // SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_
OLDNEW
« no previous file with comments | « services/ui/public/cpp/tests/window_server_shelltest_base.cc ('k') | services/ui/public/cpp/tests/window_server_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698