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_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 13 matching lines...) Expand all Loading... |
24 #include "third_party/WebKit/public/platform/WebNotificationPermission.h" | 24 #include "third_party/WebKit/public/platform/WebNotificationPermission.h" |
25 #include "third_party/WebKit/public/web/WebTextDirection.h" | 25 #include "third_party/WebKit/public/web/WebTextDirection.h" |
26 #include "ui/accessibility/ax_node_data.h" | 26 #include "ui/accessibility/ax_node_data.h" |
27 | 27 |
28 class GURL; | 28 class GURL; |
29 struct AccessibilityHostMsg_EventParams; | 29 struct AccessibilityHostMsg_EventParams; |
30 struct AccessibilityHostMsg_LocationChangeParams; | 30 struct AccessibilityHostMsg_LocationChangeParams; |
31 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params; | 31 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params; |
32 struct FrameHostMsg_OpenURL_Params; | 32 struct FrameHostMsg_OpenURL_Params; |
33 struct FrameHostMsg_BeginNavigation_Params; | 33 struct FrameHostMsg_BeginNavigation_Params; |
| 34 struct FrameMsg_CommitNavigation_Params; |
34 struct FrameMsg_Navigate_Params; | 35 struct FrameMsg_Navigate_Params; |
35 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 36 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
36 struct FrameHostMsg_ShowPopup_Params; | 37 struct FrameHostMsg_ShowPopup_Params; |
37 #endif | 38 #endif |
38 | 39 |
39 namespace base { | 40 namespace base { |
40 class FilePath; | 41 class FilePath; |
41 class ListValue; | 42 class ListValue; |
42 } | 43 } |
43 | 44 |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 gfx::NativeViewAccessible GetParentNativeViewAccessible() const; | 278 gfx::NativeViewAccessible GetParentNativeViewAccessible() const; |
278 #elif defined(OS_MACOSX) | 279 #elif defined(OS_MACOSX) |
279 // Select popup menu related methods (for external popup menus). | 280 // Select popup menu related methods (for external popup menus). |
280 void DidSelectPopupMenuItem(int selected_index); | 281 void DidSelectPopupMenuItem(int selected_index); |
281 void DidCancelPopupMenu(); | 282 void DidCancelPopupMenu(); |
282 #elif defined(OS_ANDROID) | 283 #elif defined(OS_ANDROID) |
283 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices); | 284 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices); |
284 void DidCancelPopupMenu(); | 285 void DidCancelPopupMenu(); |
285 #endif | 286 #endif |
286 | 287 |
| 288 // PlzNavigate: Indicates that a navigation has committed and is ready for |
| 289 // processing by this RenderFrameHost. |
| 290 void CommitNavigation(const FrameMsg_CommitNavigation_Params& params); |
287 protected: | 291 protected: |
288 friend class RenderFrameHostFactory; | 292 friend class RenderFrameHostFactory; |
289 | 293 |
290 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost | 294 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost |
291 // should be the abstraction needed here, but we need RenderViewHost to pass | 295 // should be the abstraction needed here, but we need RenderViewHost to pass |
292 // into WebContentsObserver::FrameDetached for now. | 296 // into WebContentsObserver::FrameDetached for now. |
293 RenderFrameHostImpl(RenderViewHostImpl* render_view_host, | 297 RenderFrameHostImpl(RenderViewHostImpl* render_view_host, |
294 RenderFrameHostDelegate* delegate, | 298 RenderFrameHostDelegate* delegate, |
295 FrameTree* frame_tree, | 299 FrameTree* frame_tree, |
296 FrameTreeNode* frame_tree_node, | 300 FrameTreeNode* frame_tree_node, |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
446 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_; | 450 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_; |
447 // The most recently received accessibility tree - for testing only. | 451 // The most recently received accessibility tree - for testing only. |
448 scoped_ptr<ui::AXTree> ax_tree_for_testing_; | 452 scoped_ptr<ui::AXTree> ax_tree_for_testing_; |
449 | 453 |
450 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); | 454 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); |
451 }; | 455 }; |
452 | 456 |
453 } // namespace content | 457 } // namespace content |
454 | 458 |
455 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ | 459 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
OLD | NEW |