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 16 matching lines...) Expand all Loading... | |
27 #include "third_party/WebKit/public/web/WebDataSource.h" | 27 #include "third_party/WebKit/public/web/WebDataSource.h" |
28 #include "third_party/WebKit/public/web/WebFrameClient.h" | 28 #include "third_party/WebKit/public/web/WebFrameClient.h" |
29 #include "third_party/WebKit/public/web/WebHistoryCommitType.h" | 29 #include "third_party/WebKit/public/web/WebHistoryCommitType.h" |
30 #include "ui/gfx/range/range.h" | 30 #include "ui/gfx/range/range.h" |
31 | 31 |
32 #if defined(OS_ANDROID) | 32 #if defined(OS_ANDROID) |
33 #include "content/renderer/media/android/renderer_media_player_manager.h" | 33 #include "content/renderer/media/android/renderer_media_player_manager.h" |
34 #endif | 34 #endif |
35 | 35 |
36 class TransportDIB; | 36 class TransportDIB; |
37 struct FrameMsg_CommitNavigation_Params; | |
37 struct FrameMsg_Navigate_Params; | 38 struct FrameMsg_Navigate_Params; |
38 | 39 |
39 namespace blink { | 40 namespace blink { |
40 class WebGeolocationClient; | 41 class WebGeolocationClient; |
41 class WebInputEvent; | 42 class WebInputEvent; |
42 class WebMouseEvent; | 43 class WebMouseEvent; |
43 class WebContentDecryptionModule; | 44 class WebContentDecryptionModule; |
44 class WebMediaPlayer; | 45 class WebMediaPlayer; |
45 class WebNotificationPresenter; | 46 class WebNotificationPresenter; |
46 class WebPushClient; | 47 class WebPushClient; |
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
523 int start, int end, | 524 int start, int end, |
524 const std::vector<blink::WebCompositionUnderline>& underlines); | 525 const std::vector<blink::WebCompositionUnderline>& underlines); |
525 void OnExtendSelectionAndDelete(int before, int after); | 526 void OnExtendSelectionAndDelete(int before, int after); |
526 void OnReload(bool ignore_cache); | 527 void OnReload(bool ignore_cache); |
527 void OnTextSurroundingSelectionRequest(size_t max_length); | 528 void OnTextSurroundingSelectionRequest(size_t max_length); |
528 void OnAddStyleSheetByURL(const std::string& url); | 529 void OnAddStyleSheetByURL(const std::string& url); |
529 void OnSetupTransitionView(const std::string& markup); | 530 void OnSetupTransitionView(const std::string& markup); |
530 void OnBeginExitTransition(const std::string& css_selector); | 531 void OnBeginExitTransition(const std::string& css_selector); |
531 void OnSetAccessibilityMode(AccessibilityMode new_mode); | 532 void OnSetAccessibilityMode(AccessibilityMode new_mode); |
532 void OnDisownOpener(); | 533 void OnDisownOpener(); |
534 | |
535 //PlzNavigate | |
Charlie Reis
2014/09/15 21:19:40
nit: Space
clamy
2014/09/18 20:50:39
Done.
| |
536 void OnCommitNavigation(const FrameMsg_CommitNavigation_Params& params); | |
537 | |
533 #if defined(OS_ANDROID) | 538 #if defined(OS_ANDROID) |
534 void OnSelectPopupMenuItems(bool canceled, | 539 void OnSelectPopupMenuItems(bool canceled, |
535 const std::vector<int>& selected_indices); | 540 const std::vector<int>& selected_indices); |
536 #elif defined(OS_MACOSX) | 541 #elif defined(OS_MACOSX) |
537 void OnSelectPopupMenuItem(int selected_index); | 542 void OnSelectPopupMenuItem(int selected_index); |
538 void OnCopyToFindPboard(); | 543 void OnCopyToFindPboard(); |
539 #endif | 544 #endif |
540 | 545 |
541 // Virtual since overridden by WebTestProxy for layout tests. | 546 // Virtual since overridden by WebTestProxy for layout tests. |
542 virtual blink::WebNavigationPolicy DecidePolicyForNavigation( | 547 virtual blink::WebNavigationPolicy DecidePolicyForNavigation( |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
739 #endif | 744 #endif |
740 | 745 |
741 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 746 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
742 | 747 |
743 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 748 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
744 }; | 749 }; |
745 | 750 |
746 } // namespace content | 751 } // namespace content |
747 | 752 |
748 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 753 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |