| 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 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 475 // should be the abstraction needed here, but we need RenderViewHost to pass | 475 // should be the abstraction needed here, but we need RenderViewHost to pass |
| 476 // into WebContentsObserver::FrameDetached for now. | 476 // into WebContentsObserver::FrameDetached for now. |
| 477 RenderFrameHostImpl(SiteInstance* site_instance, | 477 RenderFrameHostImpl(SiteInstance* site_instance, |
| 478 RenderViewHostImpl* render_view_host, | 478 RenderViewHostImpl* render_view_host, |
| 479 RenderFrameHostDelegate* delegate, | 479 RenderFrameHostDelegate* delegate, |
| 480 RenderWidgetHostDelegate* rwh_delegate, | 480 RenderWidgetHostDelegate* rwh_delegate, |
| 481 FrameTree* frame_tree, | 481 FrameTree* frame_tree, |
| 482 FrameTreeNode* frame_tree_node, | 482 FrameTreeNode* frame_tree_node, |
| 483 int32 routing_id, | 483 int32 routing_id, |
| 484 int32 widget_routing_id, | 484 int32 widget_routing_id, |
| 485 int32 surface_id, | |
| 486 int flags); | 485 int flags); |
| 487 | 486 |
| 488 private: | 487 private: |
| 489 friend class TestRenderFrameHost; | 488 friend class TestRenderFrameHost; |
| 490 friend class TestRenderViewHost; | 489 friend class TestRenderViewHost; |
| 491 | 490 |
| 492 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, CrashSubframe); | 491 FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, CrashSubframe); |
| 493 | 492 |
| 494 // IPC Message handlers. | 493 // IPC Message handlers. |
| 495 void OnAddMessageToConsole(int32 level, | 494 void OnAddMessageToConsole(int32 level, |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 781 | 780 |
| 782 // NOTE: This must be the last member. | 781 // NOTE: This must be the last member. |
| 783 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; | 782 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; |
| 784 | 783 |
| 785 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); | 784 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); |
| 786 }; | 785 }; |
| 787 | 786 |
| 788 } // namespace content | 787 } // namespace content |
| 789 | 788 |
| 790 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ | 789 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
| OLD | NEW |