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 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
274 gfx::NativeViewAccessible GetParentNativeViewAccessible() const; | 275 gfx::NativeViewAccessible GetParentNativeViewAccessible() const; |
275 #elif defined(OS_MACOSX) | 276 #elif defined(OS_MACOSX) |
276 // Select popup menu related methods (for external popup menus). | 277 // Select popup menu related methods (for external popup menus). |
277 void DidSelectPopupMenuItem(int selected_index); | 278 void DidSelectPopupMenuItem(int selected_index); |
278 void DidCancelPopupMenu(); | 279 void DidCancelPopupMenu(); |
279 #elif defined(OS_ANDROID) | 280 #elif defined(OS_ANDROID) |
280 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices); | 281 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices); |
281 void DidCancelPopupMenu(); | 282 void DidCancelPopupMenu(); |
282 #endif | 283 #endif |
283 | 284 |
285 // PlzNavigate: Indicates that a navigation is about to commit in this | |
(Do not use) nasko
2014/08/28 16:39:09
Is it about to commit? Or has it committed and we
clamy
2014/09/02 18:25:19
Is it clearer this way?
nasko
2014/09/03 16:30:26
I think it is. Thanks!
| |
286 // RenderFrameHost. | |
287 void CommitNavigation(const FrameMsg_CommitNavigation_Params& params); | |
284 protected: | 288 protected: |
285 friend class RenderFrameHostFactory; | 289 friend class RenderFrameHostFactory; |
286 | 290 |
287 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost | 291 // TODO(nasko): Remove dependency on RenderViewHost here. RenderProcessHost |
288 // should be the abstraction needed here, but we need RenderViewHost to pass | 292 // should be the abstraction needed here, but we need RenderViewHost to pass |
289 // into WebContentsObserver::FrameDetached for now. | 293 // into WebContentsObserver::FrameDetached for now. |
290 RenderFrameHostImpl(RenderViewHostImpl* render_view_host, | 294 RenderFrameHostImpl(RenderViewHostImpl* render_view_host, |
291 RenderFrameHostDelegate* delegate, | 295 RenderFrameHostDelegate* delegate, |
292 FrameTree* frame_tree, | 296 FrameTree* frame_tree, |
293 FrameTreeNode* frame_tree_node, | 297 FrameTreeNode* frame_tree_node, |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
443 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_; | 447 base::Callback<void(ui::AXEvent, int)> accessibility_testing_callback_; |
444 // The most recently received accessibility tree - for testing only. | 448 // The most recently received accessibility tree - for testing only. |
445 scoped_ptr<ui::AXTree> ax_tree_for_testing_; | 449 scoped_ptr<ui::AXTree> ax_tree_for_testing_; |
446 | 450 |
447 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); | 451 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); |
448 }; | 452 }; |
449 | 453 |
450 } // namespace content | 454 } // namespace content |
451 | 455 |
452 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ | 456 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
OLD | NEW |