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_DESKTOP_UI_BROWSER_WINDOW_H_ | 5 #ifndef MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ |
6 #define MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ | 6 #define MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "components/mus/public/cpp/window_manager_delegate.h" | 11 #include "components/mus/public/cpp/window_manager_delegate.h" |
12 #include "components/mus/public/cpp/window_tree_connection.h" | 12 #include "components/mus/public/cpp/window_tree_connection.h" |
13 #include "components/mus/public/cpp/window_tree_delegate.h" | 13 #include "components/mus/public/cpp/window_tree_delegate.h" |
14 #include "components/mus/public/interfaces/window_tree_host.mojom.h" | 14 #include "components/mus/public/interfaces/window_tree_host.mojom.h" |
15 #include "components/web_view/public/cpp/web_view.h" | 15 #include "components/web_view/public/cpp/web_view.h" |
16 #include "components/web_view/public/interfaces/web_view.mojom.h" | 16 #include "components/web_view/public/interfaces/web_view.mojom.h" |
17 #include "mandoline/ui/desktop_ui/find_bar_delegate.h" | 17 #include "mandoline/ui/desktop_ui/find_bar_delegate.h" |
18 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h" | 18 #include "mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom.h" |
19 #include "mandoline/ui/desktop_ui/public/interfaces/view_embedder.mojom.h" | 19 #include "mandoline/ui/desktop_ui/public/interfaces/view_embedder.mojom.h" |
20 #include "mojo/common/weak_binding_set.h" | 20 #include "mojo/common/weak_binding_set.h" |
21 #include "mojo/shell/public/cpp/interface_factory.h" | 21 #include "mojo/shell/public/cpp/interface_factory.h" |
22 #include "url/gurl.h" | 22 #include "url/gurl.h" |
23 | 23 |
24 namespace mojo { | 24 namespace mojo { |
25 class ApplicationConnection; | 25 class Connection; |
26 class Shell; | 26 class Shell; |
27 } | 27 } |
28 | 28 |
29 namespace ui { | 29 namespace ui { |
30 namespace mojo { | 30 namespace mojo { |
31 class UIInit; | 31 class UIInit; |
32 } | 32 } |
33 } | 33 } |
34 | 34 |
35 namespace views { | 35 namespace views { |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 void FindInPageMatchCountUpdated(int32_t request_id, | 94 void FindInPageMatchCountUpdated(int32_t request_id, |
95 int32_t count, | 95 int32_t count, |
96 bool final_update) override; | 96 bool final_update) override; |
97 void FindInPageSelectionUpdated(int32_t request_id, | 97 void FindInPageSelectionUpdated(int32_t request_id, |
98 int32_t active_match_ordinal) override; | 98 int32_t active_match_ordinal) override; |
99 | 99 |
100 // Overridden from ViewEmbedder: | 100 // Overridden from ViewEmbedder: |
101 void Embed(mojo::URLRequestPtr request) override; | 101 void Embed(mojo::URLRequestPtr request) override; |
102 | 102 |
103 // Overridden from mojo::InterfaceFactory<ViewEmbedder>: | 103 // Overridden from mojo::InterfaceFactory<ViewEmbedder>: |
104 void Create(mojo::ApplicationConnection* connection, | 104 void Create(mojo::Connection* connection, |
105 mojo::InterfaceRequest<ViewEmbedder> request) override; | 105 mojo::InterfaceRequest<ViewEmbedder> request) override; |
106 | 106 |
107 | 107 |
108 // Overridden from FindBarDelegate: | 108 // Overridden from FindBarDelegate: |
109 void OnDoFind(const std::string& find, bool forward) override; | 109 void OnDoFind(const std::string& find, bool forward) override; |
110 void OnHideFindBar() override; | 110 void OnHideFindBar() override; |
111 | 111 |
112 void Init(mus::Window* root); | 112 void Init(mus::Window* root); |
113 void EmbedOmnibox(); | 113 void EmbedOmnibox(); |
114 | 114 |
(...skipping 19 matching lines...) Expand all Loading... |
134 | 134 |
135 // The active find match. | 135 // The active find match. |
136 int32_t find_active_; | 136 int32_t find_active_; |
137 | 137 |
138 // The total number of find matches. | 138 // The total number of find matches. |
139 int32_t find_count_; | 139 int32_t find_count_; |
140 | 140 |
141 web_view::WebView web_view_; | 141 web_view::WebView web_view_; |
142 | 142 |
143 OmniboxPtr omnibox_; | 143 OmniboxPtr omnibox_; |
144 scoped_ptr<mojo::ApplicationConnection> omnibox_connection_; | 144 scoped_ptr<mojo::Connection> omnibox_connection_; |
145 | 145 |
146 DISALLOW_COPY_AND_ASSIGN(BrowserWindow); | 146 DISALLOW_COPY_AND_ASSIGN(BrowserWindow); |
147 }; | 147 }; |
148 | 148 |
149 } // namespace mandoline | 149 } // namespace mandoline |
150 | 150 |
151 #endif // MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ | 151 #endif // MANDOLINE_UI_DESKTOP_UI_BROWSER_WINDOW_H_ |
OLD | NEW |