| 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_APP_DRIVER_APP_DRIVER_H_ | 5 #ifndef MASH_APP_DRIVER_APP_DRIVER_H_ |
| 6 #define MASH_APP_DRIVER_APP_DRIVER_H_ | 6 #define MASH_APP_DRIVER_APP_DRIVER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 public ui::mojom::AcceleratorHandler { | 24 public ui::mojom::AcceleratorHandler { |
| 25 public: | 25 public: |
| 26 AppDriver(); | 26 AppDriver(); |
| 27 ~AppDriver() override; | 27 ~AppDriver() override; |
| 28 | 28 |
| 29 private: | 29 private: |
| 30 void OnAvailableCatalogEntries(mojo::Array<catalog::mojom::EntryPtr> entries); | 30 void OnAvailableCatalogEntries(mojo::Array<catalog::mojom::EntryPtr> entries); |
| 31 | 31 |
| 32 // shell::Service: | 32 // shell::Service: |
| 33 void OnStart(const shell::Identity& identity) override; | 33 void OnStart(const shell::Identity& identity) override; |
| 34 bool OnConnect(shell::Connection* connection) override; | 34 bool OnConnect(const shell::Identity& remote_identity, |
| 35 shell::InterfaceRegistry* registry) override; |
| 35 bool OnStop() override; | 36 bool OnStop() override; |
| 36 | 37 |
| 37 // ui::mojom::AcceleratorHandler: | 38 // ui::mojom::AcceleratorHandler: |
| 38 void OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) override; | 39 void OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) override; |
| 39 | 40 |
| 40 void AddAccelerators(); | 41 void AddAccelerators(); |
| 41 | 42 |
| 42 catalog::mojom::CatalogPtr catalog_; | 43 catalog::mojom::CatalogPtr catalog_; |
| 43 mojo::Binding<ui::mojom::AcceleratorHandler> binding_; | 44 mojo::Binding<ui::mojom::AcceleratorHandler> binding_; |
| 44 base::WeakPtrFactory<AppDriver> weak_factory_; | 45 base::WeakPtrFactory<AppDriver> weak_factory_; |
| 45 | 46 |
| 46 DISALLOW_COPY_AND_ASSIGN(AppDriver); | 47 DISALLOW_COPY_AND_ASSIGN(AppDriver); |
| 47 }; | 48 }; |
| 48 | 49 |
| 49 } // namespace app_driver | 50 } // namespace app_driver |
| 50 } // namespace mash | 51 } // namespace mash |
| 51 | 52 |
| 52 #endif // MASH_APP_DRIVER_APP_DRIVER_H_ | 53 #endif // MASH_APP_DRIVER_APP_DRIVER_H_ |
| OLD | NEW |