| 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 "components/mus/public/interfaces/accelerator_registrar.mojom.h" | 15 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" |
| 16 #include "mojo/public/cpp/bindings/binding.h" | 16 #include "mojo/public/cpp/bindings/binding.h" |
| 17 #include "mojo/shell/public/cpp/shell_client.h" | 17 #include "mojo/shell/public/cpp/shell_client.h" |
| 18 | 18 |
| 19 namespace mash { | 19 namespace mash { |
| 20 namespace browser_driver { | 20 namespace browser_driver { |
| 21 | 21 |
| 22 class BrowserDriverApplicationDelegate : public mojo::ShellClient, | 22 class BrowserDriverApplicationDelegate : public mojo::ShellClient, |
| 23 public mus::mojom::AcceleratorHandler { | 23 public mus::mojom::AcceleratorHandler { |
| 24 public: | 24 public: |
| 25 BrowserDriverApplicationDelegate(); | 25 BrowserDriverApplicationDelegate(); |
| 26 ~BrowserDriverApplicationDelegate() override; | 26 ~BrowserDriverApplicationDelegate() override; |
| 27 | 27 |
| 28 private: | 28 private: |
| 29 // mojo::ShellClient: | 29 // mojo::ShellClient: |
| 30 void Initialize(mojo::Shell* shell, const std::string& url, | 30 void Initialize(mojo::Connector* connector, const std::string& url, |
| 31 uint32_t id, uint32_t user_id) override; | 31 uint32_t id, uint32_t user_id) override; |
| 32 bool AcceptConnection(mojo::Connection* connection) override; | 32 bool AcceptConnection(mojo::Connection* connection) override; |
| 33 | 33 |
| 34 // mus::mojom::AcceleratorHandler: | 34 // mus::mojom::AcceleratorHandler: |
| 35 void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override; | 35 void OnAccelerator(uint32_t id, mus::mojom::EventPtr event) override; |
| 36 | 36 |
| 37 void AddAccelerators(); | 37 void AddAccelerators(); |
| 38 | 38 |
| 39 mojo::Shell* shell_; | 39 mojo::Connector* connector_; |
| 40 mojo::Binding<mus::mojom::AcceleratorHandler> binding_; | 40 mojo::Binding<mus::mojom::AcceleratorHandler> binding_; |
| 41 | 41 |
| 42 DISALLOW_COPY_AND_ASSIGN(BrowserDriverApplicationDelegate); | 42 DISALLOW_COPY_AND_ASSIGN(BrowserDriverApplicationDelegate); |
| 43 }; | 43 }; |
| 44 | 44 |
| 45 } // namespace browser_driver | 45 } // namespace browser_driver |
| 46 } // namespace mash | 46 } // namespace mash |
| 47 | 47 |
| 48 #endif // MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_ | 48 #endif // MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_ |
| OLD | NEW |