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 MANDOLINE_UI_OMNIBOX_OMNIBOX_APPLICATION_H_ | 5 #ifndef MANDOLINE_UI_OMNIBOX_OMNIBOX_APPLICATION_H_ |
6 #define MANDOLINE_UI_OMNIBOX_OMNIBOX_APPLICATION_H_ | 6 #define MANDOLINE_UI_OMNIBOX_OMNIBOX_APPLICATION_H_ |
7 | 7 |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h" | 9 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h" |
10 #include "mojo/services/tracing/public/cpp/tracing_impl.h" | 10 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
11 #include "mojo/shell/public/cpp/application_delegate.h" | 11 #include "mojo/shell/public/cpp/application_delegate.h" |
12 #include "mojo/shell/public/cpp/interface_factory.h" | 12 #include "mojo/shell/public/cpp/interface_factory.h" |
13 | 13 |
14 namespace mojo { | 14 namespace mojo { |
15 class ApplicationImpl; | 15 class Shell; |
16 } | 16 } |
17 | 17 |
18 namespace mandoline { | 18 namespace mandoline { |
19 | 19 |
20 class OmniboxApplication : public mojo::ApplicationDelegate, | 20 class OmniboxApplication : public mojo::ApplicationDelegate, |
21 public mojo::InterfaceFactory<Omnibox> { | 21 public mojo::InterfaceFactory<Omnibox> { |
22 public: | 22 public: |
23 OmniboxApplication(); | 23 OmniboxApplication(); |
24 ~OmniboxApplication() override; | 24 ~OmniboxApplication() override; |
25 | 25 |
26 private: | 26 private: |
27 // Overridden from mojo::ApplicationDelegate: | 27 // Overridden from mojo::ApplicationDelegate: |
28 void Initialize(mojo::ApplicationImpl* app) override; | 28 void Initialize(mojo::Shell* shell, const std::string& url, |
| 29 uint32_t id) override; |
29 bool AcceptConnection( | 30 bool AcceptConnection( |
30 mojo::ApplicationConnection* connection) override; | 31 mojo::ApplicationConnection* connection) override; |
31 | 32 |
32 // Overridden from mojo::InterfaceFactory<Omnibox>: | 33 // Overridden from mojo::InterfaceFactory<Omnibox>: |
33 void Create(mojo::ApplicationConnection* connection, | 34 void Create(mojo::ApplicationConnection* connection, |
34 mojo::InterfaceRequest<Omnibox> request) override; | 35 mojo::InterfaceRequest<Omnibox> request) override; |
35 | 36 |
36 mojo::ApplicationImpl* app_; | 37 mojo::Shell* shell_; |
37 mojo::TracingImpl tracing_; | 38 mojo::TracingImpl tracing_; |
38 | 39 |
39 DISALLOW_COPY_AND_ASSIGN(OmniboxApplication); | 40 DISALLOW_COPY_AND_ASSIGN(OmniboxApplication); |
40 }; | 41 }; |
41 | 42 |
42 } // namespace mandoline | 43 } // namespace mandoline |
43 | 44 |
44 #endif // MANDOLINE_UI_OMNIBOX_OMNIBOX_APPLICATION_H_ | 45 #endif // MANDOLINE_UI_OMNIBOX_OMNIBOX_APPLICATION_H_ |
OLD | NEW |