OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "third_party/WebKit/public/web/WebFrameClient.h" | 29 #include "third_party/WebKit/public/web/WebFrameClient.h" |
30 #include "third_party/WebKit/public/web/WebHistoryCommitType.h" | 30 #include "third_party/WebKit/public/web/WebHistoryCommitType.h" |
31 #include "ui/gfx/range/range.h" | 31 #include "ui/gfx/range/range.h" |
32 | 32 |
33 #if defined(OS_ANDROID) | 33 #if defined(OS_ANDROID) |
34 #include "content/renderer/media/android/renderer_media_player_manager.h" | 34 #include "content/renderer/media/android/renderer_media_player_manager.h" |
35 #endif | 35 #endif |
36 | 36 |
37 class GURL; | 37 class GURL; |
38 class TransportDIB; | 38 class TransportDIB; |
| 39 struct FrameHostMsg_AddNavigationTransitionData_Params; |
39 struct FrameMsg_Navigate_Params; | 40 struct FrameMsg_Navigate_Params; |
40 struct FrameMsg_CommitNavigation_Params; | 41 struct FrameMsg_CommitNavigation_Params; |
41 | 42 |
42 namespace blink { | 43 namespace blink { |
43 class WebGeolocationClient; | 44 class WebGeolocationClient; |
44 class WebMouseEvent; | 45 class WebMouseEvent; |
45 class WebContentDecryptionModule; | 46 class WebContentDecryptionModule; |
46 class WebMediaPlayer; | 47 class WebMediaPlayer; |
47 class WebNotificationPresenter; | 48 class WebNotificationPresenter; |
48 class WebPushClient; | 49 class WebPushClient; |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 virtual void didFinishDocumentLoad(blink::WebLocalFrame* frame); | 362 virtual void didFinishDocumentLoad(blink::WebLocalFrame* frame); |
362 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame); | 363 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame); |
363 virtual void didFailLoad(blink::WebLocalFrame* frame, | 364 virtual void didFailLoad(blink::WebLocalFrame* frame, |
364 const blink::WebURLError& error); | 365 const blink::WebURLError& error); |
365 virtual void didFinishLoad(blink::WebLocalFrame* frame); | 366 virtual void didFinishLoad(blink::WebLocalFrame* frame); |
366 virtual void didNavigateWithinPage(blink::WebLocalFrame* frame, | 367 virtual void didNavigateWithinPage(blink::WebLocalFrame* frame, |
367 const blink::WebHistoryItem& item, | 368 const blink::WebHistoryItem& item, |
368 blink::WebHistoryCommitType commit_type); | 369 blink::WebHistoryCommitType commit_type); |
369 virtual void didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame); | 370 virtual void didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame); |
370 virtual void addNavigationTransitionData( | 371 virtual void addNavigationTransitionData( |
| 372 const blink::WebString& allowedDestinationOrigin, |
| 373 const blink::WebString& selector, |
| 374 const blink::WebString& markup); |
| 375 virtual void addNavigationTransitionData( |
371 const blink::WebString& allowedDestinationOrigin, | 376 const blink::WebString& allowedDestinationOrigin, |
372 const blink::WebString& selector, | 377 const blink::WebString& selector, |
373 const blink::WebString& markup); | 378 const blink::WebString& markup, |
| 379 const blink::WebVector<blink::WebString>& web_names, |
| 380 const blink::WebVector<blink::WebRect>& web_rects); |
374 virtual void didChangeThemeColor(); | 381 virtual void didChangeThemeColor(); |
375 virtual void requestNotificationPermission( | 382 virtual void requestNotificationPermission( |
376 const blink::WebSecurityOrigin& origin, | 383 const blink::WebSecurityOrigin& origin, |
377 blink::WebNotificationPermissionCallback* callback); | 384 blink::WebNotificationPermissionCallback* callback); |
378 virtual blink::WebNotificationPresenter* notificationPresenter(); | 385 virtual blink::WebNotificationPresenter* notificationPresenter(); |
379 virtual void didChangeSelection(bool is_empty_selection); | 386 virtual void didChangeSelection(bool is_empty_selection); |
380 virtual blink::WebColorChooser* createColorChooser( | 387 virtual blink::WebColorChooser* createColorChooser( |
381 blink::WebColorChooserClient* client, | 388 blink::WebColorChooserClient* client, |
382 const blink::WebColor& initial_color, | 389 const blink::WebColor& initial_color, |
383 const blink::WebVector<blink::WebColorSuggestion>& suggestions); | 390 const blink::WebVector<blink::WebColorSuggestion>& suggestions); |
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
771 #endif | 778 #endif |
772 | 779 |
773 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 780 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
774 | 781 |
775 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 782 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
776 }; | 783 }; |
777 | 784 |
778 } // namespace content | 785 } // namespace content |
779 | 786 |
780 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 787 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |