| 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_VIEW_H_ | 5 #ifndef MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_ |
| 6 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_ | 6 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "mojo/public/cpp/application/lazy_interface_ptr.h" | 10 #include "mojo/public/cpp/application/lazy_interface_ptr.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 | 55 |
| 56 // WebWidgetClient methods: | 56 // WebWidgetClient methods: |
| 57 virtual void initializeLayerTreeView(); | 57 virtual void initializeLayerTreeView(); |
| 58 virtual blink::WebLayerTreeView* layerTreeView(); | 58 virtual blink::WebLayerTreeView* layerTreeView(); |
| 59 | 59 |
| 60 // WebFrameClient methods: | 60 // WebFrameClient methods: |
| 61 virtual blink::WebMediaPlayer* createMediaPlayer( | 61 virtual blink::WebMediaPlayer* createMediaPlayer( |
| 62 blink::WebLocalFrame* frame, | 62 blink::WebLocalFrame* frame, |
| 63 const blink::WebURL& url, | 63 const blink::WebURL& url, |
| 64 blink::WebMediaPlayerClient* client); | 64 blink::WebMediaPlayerClient* client); |
| 65 virtual blink::WebMediaPlayer* createMediaPlayer( |
| 66 blink::WebLocalFrame* frame, |
| 67 const blink::WebURL& url, |
| 68 blink::WebMediaPlayerClient* client, |
| 69 blink::WebContentDecryptionModule* initial_cdm); |
| 65 virtual blink::WebFrame* createChildFrame(blink::WebLocalFrame* parent, | 70 virtual blink::WebFrame* createChildFrame(blink::WebLocalFrame* parent, |
| 66 const blink::WebString& frameName); | 71 const blink::WebString& frameName); |
| 67 virtual void frameDetached(blink::WebFrame*); | 72 virtual void frameDetached(blink::WebFrame*); |
| 68 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); | 73 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); |
| 69 virtual blink::WebNavigationPolicy decidePolicyForNavigation( | 74 virtual blink::WebNavigationPolicy decidePolicyForNavigation( |
| 70 blink::WebLocalFrame* frame, blink::WebDataSource::ExtraData* data, | 75 blink::WebLocalFrame* frame, blink::WebDataSource::ExtraData* data, |
| 71 const blink::WebURLRequest& request, blink::WebNavigationType nav_type, | 76 const blink::WebURLRequest& request, blink::WebNavigationType nav_type, |
| 72 blink::WebNavigationPolicy default_policy, bool isRedirect); | 77 blink::WebNavigationPolicy default_policy, bool isRedirect); |
| 73 virtual void didAddMessageToConsole( | 78 virtual void didAddMessageToConsole( |
| 74 const blink::WebConsoleMessage& message, | 79 const blink::WebConsoleMessage& message, |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 scoped_refptr<base::MessageLoopProxy> compositor_thread_; | 113 scoped_refptr<base::MessageLoopProxy> compositor_thread_; |
| 109 WebMediaPlayerFactory* web_media_player_factory_; | 114 WebMediaPlayerFactory* web_media_player_factory_; |
| 110 | 115 |
| 111 base::WeakPtrFactory<HTMLDocumentView> weak_factory_; | 116 base::WeakPtrFactory<HTMLDocumentView> weak_factory_; |
| 112 DISALLOW_COPY_AND_ASSIGN(HTMLDocumentView); | 117 DISALLOW_COPY_AND_ASSIGN(HTMLDocumentView); |
| 113 }; | 118 }; |
| 114 | 119 |
| 115 } // namespace mojo | 120 } // namespace mojo |
| 116 | 121 |
| 117 #endif // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_ | 122 #endif // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_ |
| OLD | NEW |