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

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: Huh? 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 void DidDisownOpener(RenderViewHost* render_view_host); 197 void DidDisownOpener(RenderViewHost* render_view_host);
198 198
199 // Helper method to create and initialize a RenderFrameHost. If |swapped_out| 199 // Helper method to create and initialize a RenderFrameHost. If |swapped_out|
200 // is true, it will be initially placed on the swapped out hosts list. 200 // is true, it will be initially placed on the swapped out hosts list.
201 // Otherwise, it will be used for a pending cross-site navigation. 201 // Otherwise, it will be used for a pending cross-site navigation.
202 int CreateRenderFrame(SiteInstance* instance, 202 int CreateRenderFrame(SiteInstance* instance,
203 int opener_route_id, 203 int opener_route_id,
204 bool swapped_out, 204 bool swapped_out,
205 bool hidden); 205 bool hidden);
206 206
207 // Called when a provisional load on the given renderer is aborted.
208 void RendererAbortedProvisionalLoad(RenderViewHost* render_view_host);
209
210 // Sets the passed passed interstitial as the currently showing interstitial. 207 // Sets the passed passed interstitial as the currently showing interstitial.
211 // |interstitial_page| should be non NULL (use the remove_interstitial_page 208 // |interstitial_page| should be non NULL (use the remove_interstitial_page
212 // method to unset the interstitial) and no interstitial page should be set 209 // method to unset the interstitial) and no interstitial page should be set
213 // when there is already a non NULL interstitial page set. 210 // when there is already a non NULL interstitial page set.
214 void set_interstitial_page(InterstitialPageImpl* interstitial_page) { 211 void set_interstitial_page(InterstitialPageImpl* interstitial_page) {
215 DCHECK(!interstitial_page_ && interstitial_page); 212 DCHECK(!interstitial_page_ && interstitial_page);
216 interstitial_page_ = interstitial_page; 213 interstitial_page_ = interstitial_page;
217 } 214 }
218 215
219 // Unsets the currently showing interstitial. 216 // Unsets the currently showing interstitial.
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 InterstitialPageImpl* interstitial_page_; 435 InterstitialPageImpl* interstitial_page_;
439 436
440 NotificationRegistrar registrar_; 437 NotificationRegistrar registrar_;
441 438
442 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 439 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
443 }; 440 };
444 441
445 } // namespace content 442 } // namespace content
446 443
447 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 444 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698