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/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 navigation { | 16 namespace navigation { |
17 class View; | 17 class View; |
18 } | 18 } |
19 | 19 |
20 namespace views { | 20 namespace views { |
21 class AuraInit; | 21 class AuraInit; |
22 class Widget; | 22 class Widget; |
23 class WindowManagerConnection; | 23 class WindowManagerConnection; |
24 } | 24 } |
25 | 25 |
26 namespace mash { | 26 namespace mash { |
27 namespace browser { | 27 namespace browser { |
28 | 28 |
29 class Browser : public shell::Service, | 29 class Browser : public service_manager::Service, |
30 public mojom::Launchable, | 30 public mojom::Launchable, |
31 public shell::InterfaceFactory<mojom::Launchable> { | 31 public service_manager::InterfaceFactory<mojom::Launchable> { |
32 public: | 32 public: |
33 Browser(); | 33 Browser(); |
34 ~Browser() override; | 34 ~Browser() override; |
35 | 35 |
36 // Start/stop tracking individual browser windows. When we no longer track any | 36 // Start/stop tracking individual browser windows. When we no longer track any |
37 // browser windows, the application terminates. The Browser object does not | 37 // browser windows, the application terminates. The Browser object does not |
38 // own these widgets. | 38 // own these widgets. |
39 void AddWindow(views::Widget* window); | 39 void AddWindow(views::Widget* window); |
40 void RemoveWindow(views::Widget* window); | 40 void RemoveWindow(views::Widget* window); |
41 | 41 |
42 std::unique_ptr<navigation::View> CreateView(); | 42 std::unique_ptr<navigation::View> CreateView(); |
43 | 43 |
44 private: | 44 private: |
45 // shell::Service: | 45 // service_manager::Service: |
46 void OnStart(const shell::Identity& identity) override; | 46 void OnStart(const service_manager::Identity& identity) override; |
47 bool OnConnect(const shell::Identity& remote_identity, | 47 bool OnConnect(const service_manager::Identity& remote_identity, |
48 shell::InterfaceRegistry* registry) override; | 48 service_manager::InterfaceRegistry* registry) override; |
49 | 49 |
50 // mojom::Launchable: | 50 // mojom::Launchable: |
51 void Launch(uint32_t what, mojom::LaunchMode how) override; | 51 void Launch(uint32_t what, mojom::LaunchMode how) override; |
52 | 52 |
53 // shell::InterfaceFactory<mojom::Launchable>: | 53 // service_manager::InterfaceFactory<mojom::Launchable>: |
54 void Create(const shell::Identity& remote_identity, | 54 void Create(const service_manager::Identity& remote_identity, |
55 mojom::LaunchableRequest request) override; | 55 mojom::LaunchableRequest request) override; |
56 | 56 |
57 mojo::BindingSet<mojom::Launchable> bindings_; | 57 mojo::BindingSet<mojom::Launchable> bindings_; |
58 std::vector<views::Widget*> windows_; | 58 std::vector<views::Widget*> windows_; |
59 | 59 |
60 tracing::Provider tracing_; | 60 tracing::Provider tracing_; |
61 std::unique_ptr<views::AuraInit> aura_init_; | 61 std::unique_ptr<views::AuraInit> aura_init_; |
62 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; | 62 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |
63 | 63 |
64 DISALLOW_COPY_AND_ASSIGN(Browser); | 64 DISALLOW_COPY_AND_ASSIGN(Browser); |
65 }; | 65 }; |
66 | 66 |
67 } // namespace browser | 67 } // namespace browser |
68 } // namespace mash | 68 } // namespace mash |
69 | 69 |
70 #endif // MASH_BROWSER_BROWSER_H_ | 70 #endif // MASH_BROWSER_BROWSER_H_ |
OLD | NEW |