| 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_BROWSER_BROWSER_H_ | 5 #ifndef MASH_BROWSER_BROWSER_H_ |
| 6 #define MASH_BROWSER_BROWSER_H_ | 6 #define MASH_BROWSER_BROWSER_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/binder_registry.h" | 13 #include "services/service_manager/public/cpp/binder_registry.h" |
| 14 #include "services/service_manager/public/cpp/interface_factory.h" | 14 #include "services/service_manager/public/cpp/interface_factory.h" |
| 15 #include "services/service_manager/public/cpp/service.h" | 15 #include "services/service_manager/public/cpp/service.h" |
| 16 #include "services/tracing/public/cpp/provider.h" | |
| 17 | 16 |
| 18 namespace navigation { | 17 namespace navigation { |
| 19 class View; | 18 class View; |
| 20 } | 19 } |
| 21 | 20 |
| 22 namespace views { | 21 namespace views { |
| 23 class AuraInit; | 22 class AuraInit; |
| 24 class Widget; | 23 class Widget; |
| 25 } | 24 } |
| 26 | 25 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 54 | 53 |
| 55 // service_manager::InterfaceFactory<mojom::Launchable>: | 54 // service_manager::InterfaceFactory<mojom::Launchable>: |
| 56 void Create(const service_manager::Identity& remote_identity, | 55 void Create(const service_manager::Identity& remote_identity, |
| 57 mojom::LaunchableRequest request) override; | 56 mojom::LaunchableRequest request) override; |
| 58 | 57 |
| 59 mojo::BindingSet<mojom::Launchable> bindings_; | 58 mojo::BindingSet<mojom::Launchable> bindings_; |
| 60 std::vector<views::Widget*> windows_; | 59 std::vector<views::Widget*> windows_; |
| 61 | 60 |
| 62 service_manager::BinderRegistry registry_; | 61 service_manager::BinderRegistry registry_; |
| 63 | 62 |
| 64 tracing::Provider tracing_; | |
| 65 std::unique_ptr<views::AuraInit> aura_init_; | 63 std::unique_ptr<views::AuraInit> aura_init_; |
| 66 | 64 |
| 67 DISALLOW_COPY_AND_ASSIGN(Browser); | 65 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 68 }; | 66 }; |
| 69 | 67 |
| 70 } // namespace browser | 68 } // namespace browser |
| 71 } // namespace mash | 69 } // namespace mash |
| 72 | 70 |
| 73 #endif // MASH_BROWSER_BROWSER_H_ | 71 #endif // MASH_BROWSER_BROWSER_H_ |
| OLD | NEW |