OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_ | 5 #ifndef MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_ |
6 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_ | 6 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_ |
7 | 7 |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "third_party/mojo_services/src/navigation/public/interfaces/navigation.
mojom.h" | 23 #include "third_party/mojo_services/src/navigation/public/interfaces/navigation.
mojom.h" |
24 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_cli
ent_factory.h" | 24 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_cli
ent_factory.h" |
25 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_del
egate.h" | 25 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_del
egate.h" |
26 #include "third_party/mojo_services/src/view_manager/public/cpp/view_observer.h" | 26 #include "third_party/mojo_services/src/view_manager/public/cpp/view_observer.h" |
27 | 27 |
28 namespace base { | 28 namespace base { |
29 class MessageLoopProxy; | 29 class MessageLoopProxy; |
30 } | 30 } |
31 | 31 |
32 namespace media { | 32 namespace media { |
| 33 class MediaPermission; |
33 class WebEncryptedMediaClientImpl; | 34 class WebEncryptedMediaClientImpl; |
34 } | 35 } |
35 | 36 |
36 namespace mojo { | 37 namespace mojo { |
37 class ViewManager; | 38 class ViewManager; |
38 class View; | 39 class View; |
39 } | 40 } |
40 | 41 |
41 namespace html_viewer { | 42 namespace html_viewer { |
42 | 43 |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_; | 133 mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_; |
133 blink::WebView* web_view_; | 134 blink::WebView* web_view_; |
134 mojo::View* root_; | 135 mojo::View* root_; |
135 mojo::ViewManagerClientFactory view_manager_client_factory_; | 136 mojo::ViewManagerClientFactory view_manager_client_factory_; |
136 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_; | 137 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_; |
137 scoped_refptr<base::MessageLoopProxy> compositor_thread_; | 138 scoped_refptr<base::MessageLoopProxy> compositor_thread_; |
138 WebMediaPlayerFactory* web_media_player_factory_; | 139 WebMediaPlayerFactory* web_media_player_factory_; |
139 | 140 |
140 // EncryptedMediaClient attached to this frame; lazily initialized. | 141 // EncryptedMediaClient attached to this frame; lazily initialized. |
141 scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_; | 142 scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_; |
| 143 scoped_ptr<media::MediaPermission> media_permission_; |
142 | 144 |
143 // HTMLDocument owns these pointers. | 145 // HTMLDocument owns these pointers. |
144 std::set<AxProviderImpl*> ax_provider_impls_; | 146 std::set<AxProviderImpl*> ax_provider_impls_; |
145 | 147 |
146 DISALLOW_COPY_AND_ASSIGN(HTMLDocument); | 148 DISALLOW_COPY_AND_ASSIGN(HTMLDocument); |
147 }; | 149 }; |
148 | 150 |
149 } // namespace html_viewer | 151 } // namespace html_viewer |
150 | 152 |
151 #endif // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_ | 153 #endif // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_ |
OLD | NEW |