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" |
(...skipping 26 matching lines...) Expand all Loading... |
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 // shell::Service: |
46 void OnStart(const shell::Identity& identity) override; | 46 void OnStart(const shell::Identity& identity) override; |
47 bool OnConnect(shell::Connection* connection) override; | 47 bool OnConnect(const shell::Identity& remote_identity, |
| 48 shell::InterfaceRegistry* registry) override; |
48 | 49 |
49 // mojom::Launchable: | 50 // mojom::Launchable: |
50 void Launch(uint32_t what, mojom::LaunchMode how) override; | 51 void Launch(uint32_t what, mojom::LaunchMode how) override; |
51 | 52 |
52 // shell::InterfaceFactory<mojom::Launchable>: | 53 // shell::InterfaceFactory<mojom::Launchable>: |
53 void Create(const shell::Identity& remote_identity, | 54 void Create(const shell::Identity& remote_identity, |
54 mojom::LaunchableRequest request) override; | 55 mojom::LaunchableRequest request) override; |
55 | 56 |
56 mojo::BindingSet<mojom::Launchable> bindings_; | 57 mojo::BindingSet<mojom::Launchable> bindings_; |
57 std::vector<views::Widget*> windows_; | 58 std::vector<views::Widget*> windows_; |
58 | 59 |
59 tracing::Provider tracing_; | 60 tracing::Provider tracing_; |
60 std::unique_ptr<views::AuraInit> aura_init_; | 61 std::unique_ptr<views::AuraInit> aura_init_; |
61 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; | 62 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |
62 | 63 |
63 DISALLOW_COPY_AND_ASSIGN(Browser); | 64 DISALLOW_COPY_AND_ASSIGN(Browser); |
64 }; | 65 }; |
65 | 66 |
66 } // namespace browser | 67 } // namespace browser |
67 } // namespace mash | 68 } // namespace mash |
68 | 69 |
69 #endif // MASH_BROWSER_BROWSER_H_ | 70 #endif // MASH_BROWSER_BROWSER_H_ |
OLD | NEW |