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

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

Issue 118553006: Move DidFailProvisionalLoad handling from RenderView(Host) to RenderFrame(Host). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on ToT. Created 6 years, 11 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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 void DidDisownOpener(RenderViewHost* render_view_host); 201 void DidDisownOpener(RenderViewHost* render_view_host);
202 202
203 // Helper method to create and initialize a RenderFrameHost. If |swapped_out| 203 // Helper method to create and initialize a RenderFrameHost. If |swapped_out|
204 // is true, it will be initially placed on the swapped out hosts list. 204 // is true, it will be initially placed on the swapped out hosts list.
205 // Otherwise, it will be used for a pending cross-site navigation. 205 // Otherwise, it will be used for a pending cross-site navigation.
206 int CreateRenderFrame(SiteInstance* instance, 206 int CreateRenderFrame(SiteInstance* instance,
207 int opener_route_id, 207 int opener_route_id,
208 bool swapped_out, 208 bool swapped_out,
209 bool hidden); 209 bool hidden);
210 210
211 // Called when a provisional load on the given renderer is aborted.
212 void RendererAbortedProvisionalLoad(RenderViewHost* render_view_host);
213
214 // Sets the passed passed interstitial as the currently showing interstitial. 211 // Sets the passed passed interstitial as the currently showing interstitial.
215 // |interstitial_page| should be non NULL (use the remove_interstitial_page 212 // |interstitial_page| should be non NULL (use the remove_interstitial_page
216 // method to unset the interstitial) and no interstitial page should be set 213 // method to unset the interstitial) and no interstitial page should be set
217 // when there is already a non NULL interstitial page set. 214 // when there is already a non NULL interstitial page set.
218 void set_interstitial_page(InterstitialPageImpl* interstitial_page) { 215 void set_interstitial_page(InterstitialPageImpl* interstitial_page) {
219 DCHECK(!interstitial_page_ && interstitial_page); 216 DCHECK(!interstitial_page_ && interstitial_page);
220 interstitial_page_ = interstitial_page; 217 interstitial_page_ = interstitial_page;
221 } 218 }
222 219
223 // Unsets the currently showing interstitial. 220 // Unsets the currently showing interstitial.
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 InterstitialPageImpl* interstitial_page_; 439 InterstitialPageImpl* interstitial_page_;
443 440
444 NotificationRegistrar registrar_; 441 NotificationRegistrar registrar_;
445 442
446 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 443 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
447 }; 444 };
448 445
449 } // namespace content 446 } // namespace content
450 447
451 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 448 #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