| OLD | NEW |
| 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/shell/public/cpp/service.h" |
| 14 #include "services/tracing/public/cpp/tracing_impl.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 { |
| 24 | 24 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 41 // mojom::Launchable: | 41 // mojom::Launchable: |
| 42 void Launch(uint32_t what, mojom::LaunchMode how) override; | 42 void Launch(uint32_t what, mojom::LaunchMode how) override; |
| 43 | 43 |
| 44 // shell::InterfaceFactory<mojom::Launchable>: | 44 // shell::InterfaceFactory<mojom::Launchable>: |
| 45 void Create(const shell::Identity& remote_identity, | 45 void Create(const shell::Identity& remote_identity, |
| 46 mojom::LaunchableRequest request) override; | 46 mojom::LaunchableRequest request) override; |
| 47 | 47 |
| 48 mojo::BindingSet<mojom::Launchable> bindings_; | 48 mojo::BindingSet<mojom::Launchable> bindings_; |
| 49 std::vector<views::Widget*> windows_; | 49 std::vector<views::Widget*> windows_; |
| 50 | 50 |
| 51 mojo::TracingImpl tracing_; | 51 tracing::Provider tracing_; |
| 52 std::unique_ptr<views::AuraInit> aura_init_; | 52 std::unique_ptr<views::AuraInit> aura_init_; |
| 53 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; | 53 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |
| 54 | 54 |
| 55 DISALLOW_COPY_AND_ASSIGN(Webtest); | 55 DISALLOW_COPY_AND_ASSIGN(Webtest); |
| 56 }; | 56 }; |
| 57 | 57 |
| 58 } // namespace webtest | 58 } // namespace webtest |
| 59 } // namespace mash | 59 } // namespace mash |
| 60 | 60 |
| 61 #endif // MASH_WEBTEST_WEBTEST_H_ | 61 #endif // MASH_WEBTEST_WEBTEST_H_ |
| OLD | NEW |