OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_ | 5 #ifndef MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_ |
6 #define MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_ | 6 #define MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
11 | 11 |
12 #include "base/callback.h" | 12 #include "base/callback.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 15 #include "base/memory/weak_ptr.h" |
15 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" | 16 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" |
16 #include "mojo/public/cpp/bindings/binding.h" | 17 #include "mojo/public/cpp/bindings/binding.h" |
17 #include "mojo/shell/public/cpp/shell_client.h" | 18 #include "mojo/shell/public/cpp/shell_client.h" |
18 | 19 |
19 namespace mash { | 20 namespace mash { |
20 namespace browser_driver { | 21 namespace browser_driver { |
21 | 22 |
22 class BrowserDriverApplicationDelegate : public mojo::ShellClient, | 23 class BrowserDriverApplicationDelegate : public mojo::ShellClient, |
23 public mus::mojom::AcceleratorHandler { | 24 public mus::mojom::AcceleratorHandler { |
24 public: | 25 public: |
25 BrowserDriverApplicationDelegate(); | 26 BrowserDriverApplicationDelegate(); |
26 ~BrowserDriverApplicationDelegate() override; | 27 ~BrowserDriverApplicationDelegate() override; |
27 | 28 |
28 private: | 29 private: |
29 // mojo::ShellClient: | 30 // mojo::ShellClient: |
30 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, | 31 void Initialize(mojo::Connector* connector, const mojo::Identity& identity, |
31 uint32_t id) override; | 32 uint32_t id) override; |
32 bool AcceptConnection(mojo::Connection* connection) override; | 33 bool AcceptConnection(mojo::Connection* connection) override; |
| 34 void ShellConnectionLost() override; |
33 | 35 |
34 // mus::mojom::AcceleratorHandler: | 36 // mus::mojom::AcceleratorHandler: |
35 void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override; | 37 void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override; |
36 | 38 |
37 void AddAccelerators(); | 39 void AddAccelerators(); |
38 | 40 |
39 mojo::Connector* connector_; | 41 mojo::Connector* connector_; |
40 mojo::Binding<mus::mojom::AcceleratorHandler> binding_; | 42 mojo::Binding<mus::mojom::AcceleratorHandler> binding_; |
| 43 base::WeakPtrFactory<BrowserDriverApplicationDelegate> weak_factory_; |
41 | 44 |
42 DISALLOW_COPY_AND_ASSIGN(BrowserDriverApplicationDelegate); | 45 DISALLOW_COPY_AND_ASSIGN(BrowserDriverApplicationDelegate); |
43 }; | 46 }; |
44 | 47 |
45 } // namespace browser_driver | 48 } // namespace browser_driver |
46 } // namespace mash | 49 } // namespace mash |
47 | 50 |
48 #endif // MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_ | 51 #endif // MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_ |
OLD | NEW |