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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 virtual blink::WebMediaPlayer* createMediaPlayer( | 158 virtual blink::WebMediaPlayer* createMediaPlayer( |
159 blink::WebLocalFrame* frame, | 159 blink::WebLocalFrame* frame, |
160 const blink::WebURL& url, | 160 const blink::WebURL& url, |
161 blink::WebMediaPlayerClient* client, | 161 blink::WebMediaPlayerClient* client, |
162 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, | 162 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, |
163 blink::WebContentDecryptionModule* initial_cdm); | 163 blink::WebContentDecryptionModule* initial_cdm); |
164 virtual blink::WebFrame* createChildFrame( | 164 virtual blink::WebFrame* createChildFrame( |
165 blink::WebLocalFrame* parent, | 165 blink::WebLocalFrame* parent, |
166 blink::WebTreeScopeType scope, | 166 blink::WebTreeScopeType scope, |
167 const blink::WebString& frame_ame, | 167 const blink::WebString& frame_ame, |
168 blink::WebSandboxFlags sandbox_flags); | 168 blink::WebSandboxFlags sandbox_flags, |
| 169 const blink::WebFrameOwnerProperties& frame_owner_properties); |
169 virtual void frameDetached(blink::WebFrame* frame, | 170 virtual void frameDetached(blink::WebFrame* frame, |
170 blink::WebFrameClient::DetachType type); | 171 blink::WebFrameClient::DetachType type); |
171 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); | 172 virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame); |
172 virtual blink::WebNavigationPolicy decidePolicyForNavigation( | 173 virtual blink::WebNavigationPolicy decidePolicyForNavigation( |
173 const NavigationPolicyInfo& info); | 174 const NavigationPolicyInfo& info); |
174 virtual bool hasPendingNavigation(blink::WebLocalFrame* frame); | 175 virtual bool hasPendingNavigation(blink::WebLocalFrame* frame); |
175 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame); | 176 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame); |
176 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, | 177 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, |
177 const blink::WebString& source_name, | 178 const blink::WebString& source_name, |
178 unsigned source_line, | 179 unsigned source_line, |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
368 base::TimeTicks navigation_start_time_; | 369 base::TimeTicks navigation_start_time_; |
369 | 370 |
370 base::WeakPtrFactory<HTMLFrame> weak_factory_; | 371 base::WeakPtrFactory<HTMLFrame> weak_factory_; |
371 | 372 |
372 DISALLOW_COPY_AND_ASSIGN(HTMLFrame); | 373 DISALLOW_COPY_AND_ASSIGN(HTMLFrame); |
373 }; | 374 }; |
374 | 375 |
375 } // namespace html_viewer | 376 } // namespace html_viewer |
376 | 377 |
377 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ | 378 #endif // COMPONENTS_HTML_VIEWER_HTML_FRAME_H_ |
OLD | NEW |