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/application/public/cpp/application_delegate.h" | |
17 #include "mojo/public/cpp/bindings/binding.h" | 16 #include "mojo/public/cpp/bindings/binding.h" |
| 17 #include "mojo/shell/public/cpp/application_delegate.h" |
18 | 18 |
19 namespace mojo { | 19 namespace mojo { |
20 class ApplicationConnection; | 20 class ApplicationConnection; |
21 } | 21 } |
22 | 22 |
23 namespace mash { | 23 namespace mash { |
24 namespace browser_driver { | 24 namespace browser_driver { |
25 | 25 |
26 class BrowserDriverApplicationDelegate : public mojo::ApplicationDelegate, | 26 class BrowserDriverApplicationDelegate : public mojo::ApplicationDelegate, |
27 public mus::mojom::AcceleratorHandler { | 27 public mus::mojom::AcceleratorHandler { |
(...skipping 15 matching lines...) Expand all Loading... |
43 mojo::ApplicationImpl* app_; | 43 mojo::ApplicationImpl* app_; |
44 mojo::Binding<mus::mojom::AcceleratorHandler> binding_; | 44 mojo::Binding<mus::mojom::AcceleratorHandler> binding_; |
45 | 45 |
46 DISALLOW_COPY_AND_ASSIGN(BrowserDriverApplicationDelegate); | 46 DISALLOW_COPY_AND_ASSIGN(BrowserDriverApplicationDelegate); |
47 }; | 47 }; |
48 | 48 |
49 } // namespace browser_driver | 49 } // namespace browser_driver |
50 } // namespace mash | 50 } // namespace mash |
51 | 51 |
52 #endif // MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_ | 52 #endif // MASH_BROWSER_DRIVER_BROWSER_DRIVER_APPLICATION_DELEGATE_H_ |
OLD | NEW |