Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 483773002: PlzNavigate: implement CommitNavigation on the browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Nasko's comments Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 15 matching lines...) Expand all
26 #include "third_party/WebKit/public/web/WebAXObject.h" 26 #include "third_party/WebKit/public/web/WebAXObject.h"
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 GURL;
36 class TransportDIB; 37 class TransportDIB;
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;
(...skipping 26 matching lines...) Expand all
72 class RendererAccessibility; 73 class RendererAccessibility;
73 class RendererCdmManager; 74 class RendererCdmManager;
74 class RendererMediaPlayerManager; 75 class RendererMediaPlayerManager;
75 class RendererPpapiHost; 76 class RendererPpapiHost;
76 class RenderFrameObserver; 77 class RenderFrameObserver;
77 class RenderViewImpl; 78 class RenderViewImpl;
78 class RenderWidget; 79 class RenderWidget;
79 class RenderWidgetFullscreenPepper; 80 class RenderWidgetFullscreenPepper;
80 class ScreenOrientationDispatcher; 81 class ScreenOrientationDispatcher;
81 class UserMediaClientImpl; 82 class UserMediaClientImpl;
83 struct CommitNavigationParams;
84 struct CoreNavigationParams;
82 struct CustomContextMenuContext; 85 struct CustomContextMenuContext;
83 86
84 class CONTENT_EXPORT RenderFrameImpl 87 class CONTENT_EXPORT RenderFrameImpl
85 : public RenderFrame, 88 : public RenderFrame,
86 NON_EXPORTED_BASE(public blink::WebFrameClient), 89 NON_EXPORTED_BASE(public blink::WebFrameClient),
87 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) { 90 NON_EXPORTED_BASE(public media::WebMediaPlayerDelegate) {
88 public: 91 public:
89 // Creates a new RenderFrame. |render_view| is the RenderView object that this 92 // Creates a new RenderFrame. |render_view| is the RenderView object that this
90 // frame belongs to. 93 // frame belongs to.
91 // Callers *must* call |SetWebFrame| immediately after creation. 94 // Callers *must* call |SetWebFrame| immediately after creation.
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 int start, int end, 535 int start, int end,
533 const std::vector<blink::WebCompositionUnderline>& underlines); 536 const std::vector<blink::WebCompositionUnderline>& underlines);
534 void OnExtendSelectionAndDelete(int before, int after); 537 void OnExtendSelectionAndDelete(int before, int after);
535 void OnReload(bool ignore_cache); 538 void OnReload(bool ignore_cache);
536 void OnTextSurroundingSelectionRequest(size_t max_length); 539 void OnTextSurroundingSelectionRequest(size_t max_length);
537 void OnAddStyleSheetByURL(const std::string& url); 540 void OnAddStyleSheetByURL(const std::string& url);
538 void OnSetupTransitionView(const std::string& markup); 541 void OnSetupTransitionView(const std::string& markup);
539 void OnBeginExitTransition(const std::string& css_selector); 542 void OnBeginExitTransition(const std::string& css_selector);
540 void OnSetAccessibilityMode(AccessibilityMode new_mode); 543 void OnSetAccessibilityMode(AccessibilityMode new_mode);
541 void OnDisownOpener(); 544 void OnDisownOpener();
545
nasko 2014/09/26 22:16:43 nit: Overriding methods don't have spaces between
clamy 2014/09/29 20:45:31 Done.
546 // PlzNavigate
547 void OnCommitNavigation(const GURL& stream_url,
548 const CoreNavigationParams& core_params,
549 const CommitNavigationParams& commit_params);
550
542 #if defined(OS_ANDROID) 551 #if defined(OS_ANDROID)
543 void OnSelectPopupMenuItems(bool canceled, 552 void OnSelectPopupMenuItems(bool canceled,
544 const std::vector<int>& selected_indices); 553 const std::vector<int>& selected_indices);
545 #elif defined(OS_MACOSX) 554 #elif defined(OS_MACOSX)
546 void OnSelectPopupMenuItem(int selected_index); 555 void OnSelectPopupMenuItem(int selected_index);
547 void OnCopyToFindPboard(); 556 void OnCopyToFindPboard();
548 #endif 557 #endif
549 558
550 // Virtual since overridden by WebTestProxy for layout tests. 559 // Virtual since overridden by WebTestProxy for layout tests.
551 virtual blink::WebNavigationPolicy DecidePolicyForNavigation( 560 virtual blink::WebNavigationPolicy DecidePolicyForNavigation(
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 #endif 762 #endif
754 763
755 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 764 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
756 765
757 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 766 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
758 }; 767 };
759 768
760 } // namespace content 769 } // namespace content
761 770
762 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 771 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698