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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
279 gfx::NativeViewAccessible GetParentNativeViewAccessible() const; | 280 gfx::NativeViewAccessible GetParentNativeViewAccessible() const; |
280 #elif defined(OS_MACOSX) | 281 #elif defined(OS_MACOSX) |
281 // Select popup menu related methods (for external popup menus). | 282 // Select popup menu related methods (for external popup menus). |
282 void DidSelectPopupMenuItem(int selected_index); | 283 void DidSelectPopupMenuItem(int selected_index); |
283 void DidCancelPopupMenu(); | 284 void DidCancelPopupMenu(); |
284 #elif defined(OS_ANDROID) | 285 #elif defined(OS_ANDROID) |
285 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices); | 286 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices); |
286 void DidCancelPopupMenu(); | 287 void DidCancelPopupMenu(); |
287 #endif | 288 #endif |
288 | 289 |
290 // PlzNavigate: Indicates that a navigation has committed and is ready for | |
Charlie Reis
2014/09/15 21:19:39
"has committed" sounds wrong to me. This is calle
clamy
2014/09/18 20:50:39
Is it better now?
| |
291 // processing by this RenderFrameHost. | |
292 void CommitNavigation(const FrameMsg_CommitNavigation_Params& params); | |
289 protected: | 293 protected: |
290 friend class RenderFrameHostFactory; | 294 friend class RenderFrameHostFactory; |
291 | 295 |
292 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost | 296 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost |
293 // should be the abstraction needed here, but we need RenderViewHost to pass | 297 // should be the abstraction needed here, but we need RenderViewHost to pass |
294 // into WebContentsObserver::FrameDetached for now. | 298 // into WebContentsObserver::FrameDetached for now. |
295 RenderFrameHostImpl(RenderViewHostImpl* render_view_host, | 299 RenderFrameHostImpl(RenderViewHostImpl* render_view_host, |
296 RenderFrameHostDelegate* delegate, | 300 RenderFrameHostDelegate* delegate, |
297 FrameTree* frame_tree, | 301 FrameTree* frame_tree, |
298 FrameTreeNode* frame_tree_node, | 302 FrameTreeNode* frame_tree_node, |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
448 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_; | 452 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_; |
449 // The most recently received accessibility tree - for testing only. | 453 // The most recently received accessibility tree - for testing only. |
450 scoped_ptr<ui::AXTree> ax_tree_for_testing_; | 454 scoped_ptr<ui::AXTree> ax_tree_for_testing_; |
451 | 455 |
452 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); | 456 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); |
453 }; | 457 }; |
454 | 458 |
455 } // namespace content | 459 } // namespace content |
456 | 460 |
457 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ | 461 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
OLD | NEW |