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 COMPONENTS_HTML_VIEWER_FRAME_H_ | 5 #ifndef COMPONENTS_HTML_VIEWER_FRAME_H_ |
6 #define COMPONENTS_HTML_VIEWER_FRAME_H_ | 6 #define COMPONENTS_HTML_VIEWER_FRAME_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override; | 126 void OnViewInputEvent(mojo::View* view, const mojo::EventPtr& event) override; |
127 void OnViewFocusChanged(mojo::View* gained_focus, | 127 void OnViewFocusChanged(mojo::View* gained_focus, |
128 mojo::View* lost_focus) override; | 128 mojo::View* lost_focus) override; |
129 | 129 |
130 // WebViewClient methods: | 130 // WebViewClient methods: |
131 virtual void initializeLayerTreeView() override; | 131 virtual void initializeLayerTreeView() override; |
132 virtual blink::WebLayerTreeView* layerTreeView() override; | 132 virtual blink::WebLayerTreeView* layerTreeView() override; |
133 virtual blink::WebStorageNamespace* createSessionStorageNamespace(); | 133 virtual blink::WebStorageNamespace* createSessionStorageNamespace(); |
134 | 134 |
135 // WebFrameClient methods: | 135 // WebFrameClient methods: |
| 136 // TODO(srirama): Remove this method once blink updated. |
136 virtual blink::WebMediaPlayer* createMediaPlayer( | 137 virtual blink::WebMediaPlayer* createMediaPlayer( |
137 blink::WebLocalFrame* frame, | 138 blink::WebLocalFrame* frame, |
138 const blink::WebURL& url, | 139 const blink::WebURL& url, |
139 blink::WebMediaPlayerClient* client, | 140 blink::WebMediaPlayerClient* client, |
140 blink::WebContentDecryptionModule* initial_cdm); | 141 blink::WebContentDecryptionModule* initial_cdm); |
| 142 virtual blink::WebMediaPlayer* createMediaPlayer( |
| 143 blink::WebLocalFrame* frame, |
| 144 const blink::WebURL& url, |
| 145 blink::WebMediaPlayerClient* client, |
| 146 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, |
| 147 blink::WebContentDecryptionModule* initial_cdm); |
141 virtual blink::WebFrame* createChildFrame( | 148 virtual blink::WebFrame* createChildFrame( |
142 blink::WebLocalFrame* parent, | 149 blink::WebLocalFrame* parent, |
143 blink::WebTreeScopeType scope, | 150 blink::WebTreeScopeType scope, |
144 const blink::WebString& frame_ame, | 151 const blink::WebString& frame_ame, |
145 blink::WebSandboxFlags sandbox_flags); | 152 blink::WebSandboxFlags sandbox_flags); |
146 virtual void frameDetached(blink::WebFrame* frame, | 153 virtual void frameDetached(blink::WebFrame* frame, |
147 blink::WebFrameClient::DetachType type); | 154 blink::WebFrameClient::DetachType type); |
148 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); | 155 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); |
149 virtual blink::WebNavigationPolicy decidePolicyForNavigation( | 156 virtual blink::WebNavigationPolicy decidePolicyForNavigation( |
150 const NavigationPolicyInfo& info); | 157 const NavigationPolicyInfo& info); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
187 blink::WebTreeScopeType scope_; | 194 blink::WebTreeScopeType scope_; |
188 | 195 |
189 base::WeakPtrFactory<Frame> weak_factory_; | 196 base::WeakPtrFactory<Frame> weak_factory_; |
190 | 197 |
191 DISALLOW_COPY_AND_ASSIGN(Frame); | 198 DISALLOW_COPY_AND_ASSIGN(Frame); |
192 }; | 199 }; |
193 | 200 |
194 } // namespace html_viewer | 201 } // namespace html_viewer |
195 | 202 |
196 #endif // COMPONENTS_HTML_VIEWER_FRAME_H_ | 203 #endif // COMPONENTS_HTML_VIEWER_FRAME_H_ |
OLD | NEW |