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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 483773002: PlzNavigate: implement CommitNavigation on the browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NavigationRequest has ownership of NavigationParams 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_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 class CrossProcessFrameConnector; 47 class CrossProcessFrameConnector;
48 class CrossSiteTransferringRequest; 48 class CrossSiteTransferringRequest;
49 class FrameTree; 49 class FrameTree;
50 class FrameTreeNode; 50 class FrameTreeNode;
51 class RenderFrameHostDelegate; 51 class RenderFrameHostDelegate;
52 class RenderFrameProxyHost; 52 class RenderFrameProxyHost;
53 class RenderProcessHost; 53 class RenderProcessHost;
54 class RenderViewHostImpl; 54 class RenderViewHostImpl;
55 class RenderWidgetHostImpl; 55 class RenderWidgetHostImpl;
56 struct CommitNavigationParams;
56 struct ContextMenuParams; 57 struct ContextMenuParams;
58 struct CoreNavigationParams;
57 struct GlobalRequestID; 59 struct GlobalRequestID;
58 struct Referrer; 60 struct Referrer;
61 struct RequestNavigationParams;
59 struct ShowDesktopNotificationHostMsgParams; 62 struct ShowDesktopNotificationHostMsgParams;
60 struct TransitionLayerData; 63 struct TransitionLayerData;
61 64
62 class CONTENT_EXPORT RenderFrameHostImpl 65 class CONTENT_EXPORT RenderFrameHostImpl
63 : public RenderFrameHost, 66 : public RenderFrameHost,
64 public BrowserAccessibilityDelegate { 67 public BrowserAccessibilityDelegate {
65 public: 68 public:
66 static RenderFrameHostImpl* FromID(int process_id, int routing_id); 69 static RenderFrameHostImpl* FromID(int process_id, int routing_id);
67 70
68 virtual ~RenderFrameHostImpl(); 71 virtual ~RenderFrameHostImpl();
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 gfx::NativeViewAccessible GetParentNativeViewAccessible() const; 302 gfx::NativeViewAccessible GetParentNativeViewAccessible() const;
300 #elif defined(OS_MACOSX) 303 #elif defined(OS_MACOSX)
301 // Select popup menu related methods (for external popup menus). 304 // Select popup menu related methods (for external popup menus).
302 void DidSelectPopupMenuItem(int selected_index); 305 void DidSelectPopupMenuItem(int selected_index);
303 void DidCancelPopupMenu(); 306 void DidCancelPopupMenu();
304 #elif defined(OS_ANDROID) 307 #elif defined(OS_ANDROID)
305 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices); 308 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices);
306 void DidCancelPopupMenu(); 309 void DidCancelPopupMenu();
307 #endif 310 #endif
308 311
312 // PlzNavigate: Indicates that a navigation is ready to commit and can be
313 // handled by this RenderFrame.
314 void CommitNavigation(const GURL& stream_url,
315 const CoreNavigationParams& core_params,
316 const CommitNavigationParams& commit_params);
317
309 protected: 318 protected:
310 friend class RenderFrameHostFactory; 319 friend class RenderFrameHostFactory;
311 320
312 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost 321 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost
313 // should be the abstraction needed here, but we need RenderViewHost to pass 322 // should be the abstraction needed here, but we need RenderViewHost to pass
314 // into WebContentsObserver::FrameDetached for now. 323 // into WebContentsObserver::FrameDetached for now.
315 RenderFrameHostImpl(RenderViewHostImpl* render_view_host, 324 RenderFrameHostImpl(RenderViewHostImpl* render_view_host,
316 RenderFrameHostDelegate* delegate, 325 RenderFrameHostDelegate* delegate,
317 FrameTree* frame_tree, 326 FrameTree* frame_tree,
318 FrameTreeNode* frame_tree_node, 327 FrameTreeNode* frame_tree_node,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 void OnTextSurroundingSelectionResponse(const base::string16& content, 380 void OnTextSurroundingSelectionResponse(const base::string16& content,
372 size_t start_offset, 381 size_t start_offset,
373 size_t end_offset); 382 size_t end_offset);
374 void OnDidAccessInitialDocument(); 383 void OnDidAccessInitialDocument();
375 void OnDidDisownOpener(); 384 void OnDidDisownOpener();
376 void OnDidAssignPageId(int32 page_id); 385 void OnDidAssignPageId(int32 page_id);
377 void OnUpdateTitle(int32 page_id, 386 void OnUpdateTitle(int32 page_id,
378 const base::string16& title, 387 const base::string16& title,
379 blink::WebTextDirection title_direction); 388 blink::WebTextDirection title_direction);
380 void OnUpdateEncoding(const std::string& encoding); 389 void OnUpdateEncoding(const std::string& encoding);
381 void OnBeginNavigation( 390 void OnBeginNavigation(const FrameHostMsg_BeginNavigation_Params& params,
382 const FrameHostMsg_BeginNavigation_Params& params); 391 const CoreNavigationParams& core_params);
383 void OnAccessibilityEvents( 392 void OnAccessibilityEvents(
384 const std::vector<AccessibilityHostMsg_EventParams>& params); 393 const std::vector<AccessibilityHostMsg_EventParams>& params);
385 void OnAccessibilityLocationChanges( 394 void OnAccessibilityLocationChanges(
386 const std::vector<AccessibilityHostMsg_LocationChangeParams>& params); 395 const std::vector<AccessibilityHostMsg_LocationChangeParams>& params);
387 396
388 #if defined(OS_MACOSX) || defined(OS_ANDROID) 397 #if defined(OS_MACOSX) || defined(OS_ANDROID)
389 void OnShowPopup(const FrameHostMsg_ShowPopup_Params& params); 398 void OnShowPopup(const FrameHostMsg_ShowPopup_Params& params);
390 void OnHidePopup(); 399 void OnHidePopup();
391 #endif 400 #endif
392 401
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 497
489 // NOTE: This must be the last member. 498 // NOTE: This must be the last member.
490 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 499 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
491 500
492 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 501 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
493 }; 502 };
494 503
495 } // namespace content 504 } // namespace content
496 505
497 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 506 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698