| 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_MANAGER_H_ | 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ |
| 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ | 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <list> | 10 #include <list> |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 | 520 |
| 521 // Set with an existing SiteInstance to be reused. | 521 // Set with an existing SiteInstance to be reused. |
| 522 content::SiteInstance* existing_site_instance; | 522 content::SiteInstance* existing_site_instance; |
| 523 | 523 |
| 524 // In case |existing_site_instance| is null, specify a new site URL. | 524 // In case |existing_site_instance| is null, specify a new site URL. |
| 525 GURL new_site_url; | 525 GURL new_site_url; |
| 526 | 526 |
| 527 // In case |existing_site_instance| is null, specify if the new site should | 527 // In case |existing_site_instance| is null, specify if the new site should |
| 528 // be created in a new BrowsingInstance or not. | 528 // be created in a new BrowsingInstance or not. |
| 529 bool new_is_related_to_current; | 529 bool new_is_related_to_current; |
| 530 |
| 531 bool is_for_third_party_subframes = false; |
| 530 }; | 532 }; |
| 531 | 533 |
| 532 // Create a RenderFrameProxyHost owned by this object. | 534 // Create a RenderFrameProxyHost owned by this object. |
| 533 RenderFrameProxyHost* CreateRenderFrameProxyHost(SiteInstance* site_instance, | 535 RenderFrameProxyHost* CreateRenderFrameProxyHost(SiteInstance* site_instance, |
| 534 RenderViewHostImpl* rvh); | 536 RenderViewHostImpl* rvh); |
| 535 // Delete a RenderFrameProxyHost owned by this object. | 537 // Delete a RenderFrameProxyHost owned by this object. |
| 536 void DeleteRenderFrameProxyHost(SiteInstance* site_instance); | 538 void DeleteRenderFrameProxyHost(SiteInstance* site_instance); |
| 537 | 539 |
| 538 // Returns whether this tab should transition to a new renderer for | 540 // Returns whether this tab should transition to a new renderer for |
| 539 // cross-site URLs. Enabled unless we see the --process-per-tab command line | 541 // cross-site URLs. Enabled unless we see the --process-per-tab command line |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 scoped_ptr<RenderFrameHostImpl> speculative_render_frame_host_; | 782 scoped_ptr<RenderFrameHostImpl> speculative_render_frame_host_; |
| 781 | 783 |
| 782 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; | 784 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; |
| 783 | 785 |
| 784 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); | 786 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); |
| 785 }; | 787 }; |
| 786 | 788 |
| 787 } // namespace content | 789 } // namespace content |
| 788 | 790 |
| 789 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ | 791 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ |
| OLD | NEW |