Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Side by Side Diff: content/browser/frame_host/render_frame_host_manager.h

Issue 1359163005: Remove surface_id from RenderWidget/RenderWidgetHost and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@channel_creation_preempt
Patch Set: fix more tests Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 10
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 RenderViewHostDelegate* render_view_delegate, 198 RenderViewHostDelegate* render_view_delegate,
199 RenderWidgetHostDelegate* render_widget_delegate, 199 RenderWidgetHostDelegate* render_widget_delegate,
200 Delegate* delegate); 200 Delegate* delegate);
201 ~RenderFrameHostManager(); 201 ~RenderFrameHostManager();
202 202
203 // For arguments, see WebContentsImpl constructor. 203 // For arguments, see WebContentsImpl constructor.
204 void Init(BrowserContext* browser_context, 204 void Init(BrowserContext* browser_context,
205 SiteInstance* site_instance, 205 SiteInstance* site_instance,
206 int32 view_routing_id, 206 int32 view_routing_id,
207 int32 frame_routing_id, 207 int32 frame_routing_id,
208 int32 widget_routing_id, 208 int32 widget_routing_id);
209 int32 surface_id);
210 209
211 // Returns the currently active RenderFrameHost. 210 // Returns the currently active RenderFrameHost.
212 // 211 //
213 // This will be non-NULL between Init() and Shutdown(). You may want to NULL 212 // This will be non-NULL between Init() and Shutdown(). You may want to NULL
214 // check it in many cases, however. Windows can send us messages during the 213 // check it in many cases, however. Windows can send us messages during the
215 // destruction process after it has been shut down. 214 // destruction process after it has been shut down.
216 RenderFrameHostImpl* current_frame_host() const { 215 RenderFrameHostImpl* current_frame_host() const {
217 return render_frame_host_.get(); 216 return render_frame_host_.get();
218 } 217 }
219 218
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 // opener chain. Don't create proxies for the subtree rooted at 637 // opener chain. Don't create proxies for the subtree rooted at
639 // |skip_this_node|. 638 // |skip_this_node|.
640 void CreateOpenerProxiesForFrameTree(SiteInstance* instance, 639 void CreateOpenerProxiesForFrameTree(SiteInstance* instance,
641 FrameTreeNode* skip_this_node); 640 FrameTreeNode* skip_this_node);
642 641
643 // Creates a RenderFrameHost and corresponding RenderViewHost if necessary. 642 // Creates a RenderFrameHost and corresponding RenderViewHost if necessary.
644 scoped_ptr<RenderFrameHostImpl> CreateRenderFrameHost(SiteInstance* instance, 643 scoped_ptr<RenderFrameHostImpl> CreateRenderFrameHost(SiteInstance* instance,
645 int32 view_routing_id, 644 int32 view_routing_id,
646 int32 frame_routing_id, 645 int32 frame_routing_id,
647 int32 widget_routing_id, 646 int32 widget_routing_id,
648 int32 surface_id,
649 int flags); 647 int flags);
650 648
651 // PlzNavigate 649 // PlzNavigate
652 // Creates and initializes a speculative RenderFrameHost and/or WebUI for an 650 // Creates and initializes a speculative RenderFrameHost and/or WebUI for an
653 // ongoing navigation. They might be destroyed and re-created later if the 651 // ongoing navigation. They might be destroyed and re-created later if the
654 // navigation is redirected to a different SiteInstance. 652 // navigation is redirected to a different SiteInstance.
655 bool CreateSpeculativeRenderFrameHost(const GURL& url, 653 bool CreateSpeculativeRenderFrameHost(const GURL& url,
656 SiteInstance* old_instance, 654 SiteInstance* old_instance,
657 SiteInstance* new_instance, 655 SiteInstance* new_instance,
658 int bindings); 656 int bindings);
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 bool should_reuse_web_ui_; 814 bool should_reuse_web_ui_;
817 815
818 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 816 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
819 817
820 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 818 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
821 }; 819 };
822 820
823 } // namespace content 821 } // namespace content
824 822
825 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 823 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698