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_BROWSER_BROWSER_H_ | 5 #ifndef MANDOLINE_UI_BROWSER_BROWSER_H_ |
6 #define MANDOLINE_UI_BROWSER_BROWSER_H_ | 6 #define MANDOLINE_UI_BROWSER_BROWSER_H_ |
7 | 7 |
8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
9 #include "components/view_manager/public/cpp/view_manager.h" | 9 #include "components/view_manager/public/cpp/view_manager.h" |
10 #include "components/view_manager/public/cpp/view_manager_delegate.h" | 10 #include "components/view_manager/public/cpp/view_manager_delegate.h" |
11 #include "components/window_manager/window_manager_app.h" | 11 #include "components/window_manager/window_manager_app.h" |
12 #include "components/window_manager/window_manager_delegate.h" | 12 #include "components/window_manager/window_manager_delegate.h" |
13 #include "mandoline/services/navigation/public/interfaces/navigation.mojom.h" | 13 #include "mandoline/services/navigation/public/interfaces/navigation.mojom.h" |
14 #include "mandoline/ui/browser/navigator_host_impl.h" | 14 #include "mandoline/ui/browser/navigator_host_impl.h" |
| 15 #include "mandoline/ui/browser/omnibox.mojom.h" |
15 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.
h" | 16 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.
h" |
16 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" | 17 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" |
17 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h" | 18 #include "third_party/mojo/src/mojo/public/cpp/application/connect.h" |
18 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl
.h" | 19 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl
.h" |
19 #include "ui/mojo/events/input_events.mojom.h" | 20 #include "ui/mojo/events/input_events.mojom.h" |
| 21 #include "url/gurl.h" |
20 | 22 |
21 namespace mandoline { | 23 namespace mandoline { |
22 | 24 |
23 class BrowserUI; | 25 class BrowserUI; |
24 class MergedServiceProvider; | 26 class MergedServiceProvider; |
25 | 27 |
26 class Browser : public mojo::ApplicationDelegate, | 28 class Browser : public mojo::ApplicationDelegate, |
27 public mojo::ViewManagerDelegate, | 29 public mojo::ViewManagerDelegate, |
28 public window_manager::WindowManagerDelegate, | 30 public window_manager::WindowManagerDelegate, |
| 31 public OmniboxClient, |
29 public mojo::InterfaceFactory<mojo::NavigatorHost> { | 32 public mojo::InterfaceFactory<mojo::NavigatorHost> { |
30 public: | 33 public: |
31 Browser(); | 34 Browser(); |
32 ~Browser() override; | 35 ~Browser() override; |
33 | 36 |
34 base::WeakPtr<Browser> GetWeakPtr(); | 37 base::WeakPtr<Browser> GetWeakPtr(); |
35 | 38 |
36 void ReplaceContentWithURL(const mojo::String& url); | 39 void ReplaceContentWithURL(const mojo::String& url); |
37 | 40 |
| 41 mojo::View* content() { return content_; } |
| 42 mojo::View* omnibox() { return omnibox_; } |
| 43 |
| 44 const GURL& current_url() const { return current_url_; } |
| 45 |
38 private: | 46 private: |
39 // Overridden from mojo::ApplicationDelegate: | 47 // Overridden from mojo::ApplicationDelegate: |
40 void Initialize(mojo::ApplicationImpl* app) override; | 48 void Initialize(mojo::ApplicationImpl* app) override; |
41 bool ConfigureIncomingConnection( | 49 bool ConfigureIncomingConnection( |
42 mojo::ApplicationConnection* connection) override; | 50 mojo::ApplicationConnection* connection) override; |
43 bool ConfigureOutgoingConnection( | 51 bool ConfigureOutgoingConnection( |
44 mojo::ApplicationConnection* connection) override; | 52 mojo::ApplicationConnection* connection) override; |
45 | 53 |
46 // Overridden from mojo::ViewManagerDelegate: | 54 // Overridden from mojo::ViewManagerDelegate: |
47 void OnEmbed(mojo::View* root, | 55 void OnEmbed(mojo::View* root, |
48 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 56 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
49 mojo::ServiceProviderPtr exposed_services) override; | 57 mojo::ServiceProviderPtr exposed_services) override; |
50 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override; | 58 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override; |
51 | 59 |
52 // Overridden from WindowManagerDelegate: | 60 // Overridden from WindowManagerDelegate: |
53 void Embed(const mojo::String& url, | 61 void Embed(const mojo::String& url, |
54 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 62 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
55 mojo::ServiceProviderPtr exposed_services) override; | 63 mojo::ServiceProviderPtr exposed_services) override; |
56 void OnAcceleratorPressed(mojo::View* view, | 64 void OnAcceleratorPressed(mojo::View* view, |
57 mojo::KeyboardCode keyboard_code, | 65 mojo::KeyboardCode keyboard_code, |
58 mojo::EventFlags flags) override; | 66 mojo::EventFlags flags) override; |
59 | 67 |
| 68 // Overridden from OmniboxClient: |
| 69 void OpenURL(const mojo::String& url) override; |
| 70 |
60 // Overridden from mojo::InterfaceFactory<mojo::NavigatorHost>: | 71 // Overridden from mojo::InterfaceFactory<mojo::NavigatorHost>: |
61 void Create(mojo::ApplicationConnection* connection, | 72 void Create(mojo::ApplicationConnection* connection, |
62 mojo::InterfaceRequest<mojo::NavigatorHost> request) override; | 73 mojo::InterfaceRequest<mojo::NavigatorHost> request) override; |
63 | 74 |
| 75 void ShowOmnibox(const mojo::String& url, |
| 76 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 77 mojo::ServiceProviderPtr exposed_services); |
| 78 |
64 scoped_ptr<window_manager::WindowManagerApp> window_manager_app_; | 79 scoped_ptr<window_manager::WindowManagerApp> window_manager_app_; |
65 | 80 |
66 // Only support being embedded once, so both application-level | 81 // Only support being embedded once, so both application-level |
67 // and embedding-level state are shared on the same object. | 82 // and embedding-level state are shared on the same object. |
68 mojo::View* root_; | 83 mojo::View* root_; |
69 mojo::View* content_; | 84 mojo::View* content_; |
| 85 mojo::View* omnibox_; |
70 std::string default_url_; | 86 std::string default_url_; |
71 std::string pending_url_; | 87 std::string pending_url_; |
72 | 88 |
73 mojo::ServiceProviderImpl exposed_services_impl_; | 89 mojo::ServiceProviderImpl exposed_services_impl_; |
74 scoped_ptr<MergedServiceProvider> merged_service_provider_; | 90 scoped_ptr<MergedServiceProvider> merged_service_provider_; |
75 | 91 |
76 NavigatorHostImpl navigator_host_; | 92 NavigatorHostImpl navigator_host_; |
77 | 93 |
| 94 GURL current_url_; |
| 95 |
78 scoped_ptr<BrowserUI> ui_; | 96 scoped_ptr<BrowserUI> ui_; |
79 | 97 |
80 base::WeakPtrFactory<Browser> weak_factory_; | 98 base::WeakPtrFactory<Browser> weak_factory_; |
81 | 99 |
82 DISALLOW_COPY_AND_ASSIGN(Browser); | 100 DISALLOW_COPY_AND_ASSIGN(Browser); |
83 }; | 101 }; |
84 | 102 |
85 } // namespace mandoline | 103 } // namespace mandoline |
86 | 104 |
87 #endif // MANDOLINE_UI_BROWSER_BROWSER_H_ | 105 #endif // MANDOLINE_UI_BROWSER_BROWSER_H_ |
OLD | NEW |