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_HTML_FRAME_H_ | 5 #ifndef COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ |
6 #define COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ | 6 #define COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 virtual blink::WebMediaPlayer* createMediaPlayer( | 156 virtual blink::WebMediaPlayer* createMediaPlayer( |
157 blink::WebLocalFrame* frame, | 157 blink::WebLocalFrame* frame, |
158 const blink::WebURL& url, | 158 const blink::WebURL& url, |
159 blink::WebMediaPlayerClient* client, | 159 blink::WebMediaPlayerClient* client, |
160 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, | 160 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, |
161 blink::WebContentDecryptionModule* initial_cdm); | 161 blink::WebContentDecryptionModule* initial_cdm); |
162 virtual blink::WebFrame* createChildFrame( | 162 virtual blink::WebFrame* createChildFrame( |
163 blink::WebLocalFrame* parent, | 163 blink::WebLocalFrame* parent, |
164 blink::WebTreeScopeType scope, | 164 blink::WebTreeScopeType scope, |
165 const blink::WebString& frame_ame, | 165 const blink::WebString& frame_ame, |
166 blink::WebSandboxFlags sandbox_flags); | 166 blink::WebSandboxFlags sandbox_flags, |
| 167 const blink::WebFrameOwnerProperties& frame_owner_properties); |
167 virtual void frameDetached(blink::WebFrame* frame, | 168 virtual void frameDetached(blink::WebFrame* frame, |
168 blink::WebFrameClient::DetachType type); | 169 blink::WebFrameClient::DetachType type); |
169 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); | 170 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); |
170 virtual blink::WebNavigationPolicy decidePolicyForNavigation( | 171 virtual blink::WebNavigationPolicy decidePolicyForNavigation( |
171 const NavigationPolicyInfo& info); | 172 const NavigationPolicyInfo& info); |
172 virtual bool hasPendingNavigation(blink::WebLocalFrame* frame); | 173 virtual bool hasPendingNavigation(blink::WebLocalFrame* frame); |
173 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame); | 174 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame); |
174 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, | 175 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, |
175 const blink::WebString& source_name, | 176 const blink::WebString& source_name, |
176 unsigned source_line, | 177 unsigned source_line, |
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 bool pending_navigation_; | 341 bool pending_navigation_; |
341 | 342 |
342 base::WeakPtrFactory<HTMLFrame> weak_factory_; | 343 base::WeakPtrFactory<HTMLFrame> weak_factory_; |
343 | 344 |
344 DISALLOW_COPY_AND_ASSIGN(HTMLFrame); | 345 DISALLOW_COPY_AND_ASSIGN(HTMLFrame); |
345 }; | 346 }; |
346 | 347 |
347 } // namespace html_viewer | 348 } // namespace html_viewer |
348 | 349 |
349 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ | 350 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ |
OLD | NEW |