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/shell/public/cpp/shell_client.h" | 13 #include "services/shell/public/cpp/shell_client.h" |
14 #include "services/tracing/public/cpp/tracing_impl.h" | 14 #include "services/tracing/public/cpp/tracing_impl.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 } | 20 } |
20 | 21 |
21 namespace mash { | 22 namespace mash { |
22 namespace browser { | 23 namespace browser { |
23 | 24 |
24 class Browser : public shell::ShellClient, | 25 class Browser : public shell::ShellClient, |
25 public mojom::Launchable, | 26 public mojom::Launchable, |
26 public shell::InterfaceFactory<mojom::Launchable> { | 27 public shell::InterfaceFactory<mojom::Launchable> { |
27 public: | 28 public: |
28 Browser(); | 29 Browser(); |
(...skipping 18 matching lines...) Expand all Loading... | |
47 // shell::InterfaceFactory<mojom::Launchable>: | 48 // shell::InterfaceFactory<mojom::Launchable>: |
48 void Create(shell::Connection* connection, | 49 void Create(shell::Connection* connection, |
49 mojom::LaunchableRequest request) override; | 50 mojom::LaunchableRequest request) override; |
50 | 51 |
51 shell::Connector* connector_ = nullptr; | 52 shell::Connector* connector_ = nullptr; |
52 mojo::BindingSet<mojom::Launchable> bindings_; | 53 mojo::BindingSet<mojom::Launchable> bindings_; |
53 std::vector<views::Widget*> windows_; | 54 std::vector<views::Widget*> windows_; |
54 | 55 |
55 mojo::TracingImpl tracing_; | 56 mojo::TracingImpl tracing_; |
56 std::unique_ptr<views::AuraInit> aura_init_; | 57 std::unique_ptr<views::AuraInit> aura_init_; |
58 std::unique_ptr<views::WindowManagerConnection> views_mus_; | |
sky
2016/05/31 18:57:24
ditto
| |
57 | 59 |
58 DISALLOW_COPY_AND_ASSIGN(Browser); | 60 DISALLOW_COPY_AND_ASSIGN(Browser); |
59 }; | 61 }; |
60 | 62 |
61 } // namespace browser | 63 } // namespace browser |
62 } // namespace mash | 64 } // namespace mash |
63 | 65 |
64 #endif // MASH_BROWSER_BROWSER_H_ | 66 #endif // MASH_BROWSER_BROWSER_H_ |
OLD | NEW |