| 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" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "mojo/public/cpp/application/interface_factory.h" | 12 #include "mojo/public/cpp/application/interface_factory.h" |
| 13 #include "mojo/public/cpp/application/lazy_interface_ptr.h" | 13 #include "mojo/public/cpp/application/lazy_interface_ptr.h" |
| 14 #include "mojo/public/cpp/application/service_provider_impl.h" | 14 #include "mojo/public/cpp/application/service_provider_impl.h" |
| 15 #include "mojo/public/cpp/bindings/interface_impl.h" | 15 #include "mojo/public/cpp/bindings/interface_impl.h" |
| 16 #include "mojo/public/interfaces/application/application.mojom.h" | 16 #include "mojo/public/interfaces/application/application.mojom.h" |
| 17 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.
h" | 17 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.
h" |
| 18 #include "mojo/services/html_viewer/ax_provider_impl.h" | 18 #include "mojo/services/html_viewer/ax_provider_impl.h" |
| 19 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h" | 19 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h" |
| 20 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" | 20 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" |
| 21 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h" | 21 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h" |
| 22 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h" | 22 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h" |
| 23 #include "mojo/services/view_manager/public/cpp/view_observer.h" | 23 #include "mojo/services/view_manager/public/cpp/view_observer.h" |
| 24 #include "third_party/WebKit/public/web/WebFrameClient.h" | 24 #include "third_party/WebKit/public/web/WebFrameClient.h" |
| 25 #include "third_party/WebKit/public/web/WebSandboxFlags.h" |
| 25 #include "third_party/WebKit/public/web/WebViewClient.h" | 26 #include "third_party/WebKit/public/web/WebViewClient.h" |
| 26 | 27 |
| 27 namespace base { | 28 namespace base { |
| 28 class MessageLoopProxy; | 29 class MessageLoopProxy; |
| 29 } | 30 } |
| 30 | 31 |
| 31 namespace media { | 32 namespace media { |
| 32 class WebEncryptedMediaClientImpl; | 33 class WebEncryptedMediaClientImpl; |
| 33 } | 34 } |
| 34 | 35 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 // WebFrameClient methods: | 77 // WebFrameClient methods: |
| 77 virtual blink::WebMediaPlayer* createMediaPlayer( | 78 virtual blink::WebMediaPlayer* createMediaPlayer( |
| 78 blink::WebLocalFrame* frame, | 79 blink::WebLocalFrame* frame, |
| 79 const blink::WebURL& url, | 80 const blink::WebURL& url, |
| 80 blink::WebMediaPlayerClient* client); | 81 blink::WebMediaPlayerClient* client); |
| 81 virtual blink::WebMediaPlayer* createMediaPlayer( | 82 virtual blink::WebMediaPlayer* createMediaPlayer( |
| 82 blink::WebLocalFrame* frame, | 83 blink::WebLocalFrame* frame, |
| 83 const blink::WebURL& url, | 84 const blink::WebURL& url, |
| 84 blink::WebMediaPlayerClient* client, | 85 blink::WebMediaPlayerClient* client, |
| 85 blink::WebContentDecryptionModule* initial_cdm); | 86 blink::WebContentDecryptionModule* initial_cdm); |
| 87 // TODO(alexmos): Remove once Blink is updated to pass sandboxFlags. |
| 86 virtual blink::WebFrame* createChildFrame(blink::WebLocalFrame* parent, | 88 virtual blink::WebFrame* createChildFrame(blink::WebLocalFrame* parent, |
| 87 const blink::WebString& frameName); | 89 const blink::WebString& frameName); |
| 90 virtual blink::WebFrame* createChildFrame( |
| 91 blink::WebLocalFrame* parent, |
| 92 const blink::WebString& frameName, |
| 93 blink::WebSandboxFlags sandboxFlags); |
| 88 virtual void frameDetached(blink::WebFrame*); | 94 virtual void frameDetached(blink::WebFrame*); |
| 89 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); | 95 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); |
| 90 virtual blink::WebNavigationPolicy decidePolicyForNavigation( | 96 virtual blink::WebNavigationPolicy decidePolicyForNavigation( |
| 91 blink::WebLocalFrame* frame, | 97 blink::WebLocalFrame* frame, |
| 92 blink::WebDataSource::ExtraData* data, | 98 blink::WebDataSource::ExtraData* data, |
| 93 const blink::WebURLRequest& request, | 99 const blink::WebURLRequest& request, |
| 94 blink::WebNavigationType nav_type, | 100 blink::WebNavigationType nav_type, |
| 95 blink::WebNavigationPolicy default_policy, | 101 blink::WebNavigationPolicy default_policy, |
| 96 bool isRedirect); | 102 bool isRedirect); |
| 97 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, | 103 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 | 146 |
| 141 // HTMLDocument owns these pointers. | 147 // HTMLDocument owns these pointers. |
| 142 std::set<AxProviderImpl*> ax_provider_impls_; | 148 std::set<AxProviderImpl*> ax_provider_impls_; |
| 143 | 149 |
| 144 DISALLOW_COPY_AND_ASSIGN(HTMLDocument); | 150 DISALLOW_COPY_AND_ASSIGN(HTMLDocument); |
| 145 }; | 151 }; |
| 146 | 152 |
| 147 } // namespace html_viewer | 153 } // namespace html_viewer |
| 148 | 154 |
| 149 #endif // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_ | 155 #endif // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_ |
| OLD | NEW |