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

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

Issue 452673002: Don't leave a RenderFrameProxyHost for the current RenderFrameHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Original Created 6 years, 4 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 | Annotate | Revision Log
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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 scoped_ptr<RenderFrameHostImpl> SetRenderFrameHost( 452 scoped_ptr<RenderFrameHostImpl> SetRenderFrameHost(
453 scoped_ptr<RenderFrameHostImpl> render_frame_host); 453 scoped_ptr<RenderFrameHostImpl> render_frame_host);
454 454
455 RenderFrameHostImpl* UpdateStateForNavigate( 455 RenderFrameHostImpl* UpdateStateForNavigate(
456 const NavigationEntryImpl& entry); 456 const NavigationEntryImpl& entry);
457 457
458 // Called when a renderer process is starting to close. We should not 458 // Called when a renderer process is starting to close. We should not
459 // schedule new navigations in its swapped out RenderFrameHosts after this. 459 // schedule new navigations in its swapped out RenderFrameHosts after this.
460 void RendererProcessClosing(RenderProcessHost* render_process_host); 460 void RendererProcessClosing(RenderProcessHost* render_process_host);
461 461
462 // Helper method to delete a RenderFrameProxyHost from the list, if one exists
463 // for the given |instance|.
464 void DeleteRenderFrameProxyHost(SiteInstance* instance);
465
462 // For use in creating RenderFrameHosts. 466 // For use in creating RenderFrameHosts.
463 FrameTreeNode* frame_tree_node_; 467 FrameTreeNode* frame_tree_node_;
464 468
465 // Our delegate, not owned by us. Guaranteed non-NULL. 469 // Our delegate, not owned by us. Guaranteed non-NULL.
466 Delegate* delegate_; 470 Delegate* delegate_;
467 471
468 // Whether a navigation requiring different RenderFrameHosts is pending. This 472 // Whether a navigation requiring different RenderFrameHosts is pending. This
469 // is either for cross-site requests or when required for the process type 473 // is either for cross-site requests or when required for the process type
470 // (like WebUI). 474 // (like WebUI).
471 bool cross_navigation_pending_; 475 bool cross_navigation_pending_;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 scoped_ptr<NavigationRequest> navigation_request_; 533 scoped_ptr<NavigationRequest> navigation_request_;
530 534
531 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 535 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
532 536
533 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 537 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
534 }; 538 };
535 539
536 } // namespace content 540 } // namespace content
537 541
538 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 542 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698