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

Side by Side Diff: mash/webtest/webtest.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
« no previous file with comments | « mash/webtest/main.cc ('k') | mash/webtest/webtest.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 MASH_WEBTEST_WEBTEST_H_ 5 #ifndef MASH_WEBTEST_WEBTEST_H_
6 #define MASH_WEBTEST_WEBTEST_H_ 6 #define MASH_WEBTEST_WEBTEST_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "mash/public/interfaces/launchable.mojom.h" 11 #include "mash/public/interfaces/launchable.mojom.h"
12 #include "mojo/public/cpp/bindings/binding_set.h" 12 #include "mojo/public/cpp/bindings/binding_set.h"
13 #include "services/shell/public/cpp/service.h" 13 #include "services/service_manager/public/cpp/service.h"
14 #include "services/tracing/public/cpp/provider.h" 14 #include "services/tracing/public/cpp/provider.h"
15 15
16 namespace views { 16 namespace views {
17 class AuraInit; 17 class AuraInit;
18 class Widget; 18 class Widget;
19 class WindowManagerConnection; 19 class WindowManagerConnection;
20 } 20 }
21 21
22 namespace mash { 22 namespace mash {
23 namespace webtest { 23 namespace webtest {
(...skipping 29 matching lines...) Expand all
53 std::unique_ptr<views::AuraInit> aura_init_; 53 std::unique_ptr<views::AuraInit> aura_init_;
54 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 54 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
55 55
56 DISALLOW_COPY_AND_ASSIGN(Webtest); 56 DISALLOW_COPY_AND_ASSIGN(Webtest);
57 }; 57 };
58 58
59 } // namespace webtest 59 } // namespace webtest
60 } // namespace mash 60 } // namespace mash
61 61
62 #endif // MASH_WEBTEST_WEBTEST_H_ 62 #endif // MASH_WEBTEST_WEBTEST_H_
OLDNEW
« no previous file with comments | « mash/webtest/main.cc ('k') | mash/webtest/webtest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698