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

Side by Side Diff: mash/webtest/webtest.h

Issue 2569413003: Converts more services to use aura-mus (Closed)
Patch Set: merge Created 4 years 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/BUILD.gn ('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/service_manager/public/cpp/interface_factory.h" 13 #include "services/service_manager/public/cpp/interface_factory.h"
14 #include "services/service_manager/public/cpp/service.h" 14 #include "services/service_manager/public/cpp/service.h"
15 #include "services/tracing/public/cpp/provider.h" 15 #include "services/tracing/public/cpp/provider.h"
16 16
17 namespace views { 17 namespace views {
18 class AuraInit; 18 class AuraInit;
19 class Widget; 19 class Widget;
20 class WindowManagerConnection;
21 } 20 }
22 21
23 namespace mash { 22 namespace mash {
24 namespace webtest { 23 namespace webtest {
25 24
26 class Webtest : public service_manager::Service, 25 class Webtest : public service_manager::Service,
27 public mojom::Launchable, 26 public mojom::Launchable,
28 public service_manager::InterfaceFactory<mojom::Launchable> { 27 public service_manager::InterfaceFactory<mojom::Launchable> {
29 public: 28 public:
30 Webtest(); 29 Webtest();
(...skipping 13 matching lines...) Expand all
44 43
45 // service_manager::InterfaceFactory<mojom::Launchable>: 44 // service_manager::InterfaceFactory<mojom::Launchable>:
46 void Create(const service_manager::Identity& remote_identity, 45 void Create(const service_manager::Identity& remote_identity,
47 mojom::LaunchableRequest request) override; 46 mojom::LaunchableRequest request) override;
48 47
49 mojo::BindingSet<mojom::Launchable> bindings_; 48 mojo::BindingSet<mojom::Launchable> bindings_;
50 std::vector<views::Widget*> windows_; 49 std::vector<views::Widget*> windows_;
51 50
52 tracing::Provider tracing_; 51 tracing::Provider tracing_;
53 std::unique_ptr<views::AuraInit> aura_init_; 52 std::unique_ptr<views::AuraInit> aura_init_;
54 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
55 53
56 DISALLOW_COPY_AND_ASSIGN(Webtest); 54 DISALLOW_COPY_AND_ASSIGN(Webtest);
57 }; 55 };
58 56
59 } // namespace webtest 57 } // namespace webtest
60 } // namespace mash 58 } // namespace mash
61 59
62 #endif // MASH_WEBTEST_WEBTEST_H_ 60 #endif // MASH_WEBTEST_WEBTEST_H_
OLDNEW
« no previous file with comments | « mash/webtest/BUILD.gn ('k') | mash/webtest/webtest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698