diff options
author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-17 19:36:52 +0000 |
---|---|---|
committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-17 19:36:52 +0000 |
commit | a0729671be0628b5d2c45ef9c19a51c53bfa65b5 (patch) | |
tree | 5e4fadde19f6c5702a799cc3b786fee48fc4c9c0 /chrome/browser/navigation_controller.h | |
parent | 39ae0a282dc3c1b9e1aea492e11c4d1439ac6921 (diff) | |
download | chromium_src-a0729671be0628b5d2c45ef9c19a51c53bfa65b5.zip chromium_src-a0729671be0628b5d2c45ef9c19a51c53bfa65b5.tar.gz chromium_src-a0729671be0628b5d2c45ef9c19a51c53bfa65b5.tar.bz2 |
Revamp of the interstitial pages.
The interstitial is now a RVH that is displayed on top of the WebContents with no interaction with the WebContents' RenderViewHostManager.
This simplifies the states that the RenderViewHostManager has. The interstitial is responsible for hiding and deleting itself when told to proceed/not proceed or when a navigation occurs or the tab is closed.
The interstitial now uses a data URL (instead of loading some alternate HTML), which allowed me to remove some interstitial flags from NavigationController::LoadCommittedDetails and ProvisionalLoadDetails.
Also changed tab_utils::GetTabContentsByID to return a WebContents since only WebContents have a RVH associated with them.
TEST=Run all ui tests and unit tests.
Review URL: http://codereview.chromium.org/13764
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/navigation_controller.h')
-rw-r--r-- | chrome/browser/navigation_controller.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/navigation_controller.h b/chrome/browser/navigation_controller.h index bd1d2aa..ce5a20f 100644 --- a/chrome/browser/navigation_controller.h +++ b/chrome/browser/navigation_controller.h @@ -51,8 +51,7 @@ class NavigationController { : entry(NULL), is_auto(false), is_in_page(false), - is_main_frame(true), - is_interstitial(false) { + is_main_frame(true) { } // The committed entry. This will be the active entry in the controller. @@ -85,10 +84,6 @@ class NavigationController { // sub-frame. bool is_main_frame; - // True when this navigation is for an interstitial page. Many consumers - // won't care about interstitial loads. - bool is_interstitial; - // Whether the content of this frame has been altered/blocked because it was // unsafe. bool is_content_filtered; @@ -325,7 +320,6 @@ class NavigationController { // In the case that nothing has changed, the details structure is undefined // and it will return false. bool RendererDidNavigate(const ViewHostMsg_FrameNavigate_Params& params, - bool is_interstitial, LoadCommittedDetails* details); // Notifies us that we just became active. This is used by the TabContents |