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/provisional_load_details.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/provisional_load_details.h')
| -rw-r--r-- | chrome/browser/provisional_load_details.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/chrome/browser/provisional_load_details.h b/chrome/browser/provisional_load_details.h index 9f63acb..5cb9501 100644 --- a/chrome/browser/provisional_load_details.h +++ b/chrome/browser/provisional_load_details.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_PROVISIONAL_LOAD_DETAILS_H__ -#define CHROME_BROWSER_PROVISIONAL_LOAD_DETAILS_H__ +#ifndef CHROME_BROWSER_PROVISIONAL_LOAD_DETAILS_H_ +#define CHROME_BROWSER_PROVISIONAL_LOAD_DETAILS_H_ #include "base/basictypes.h" #include "googleurl/src/gurl.h" @@ -20,7 +20,6 @@ class ProvisionalLoadDetails { public: ProvisionalLoadDetails(bool main_frame, - bool interstitial_page, bool in_page_navigation, const GURL& url, const std::string& security_info, @@ -34,8 +33,6 @@ class ProvisionalLoadDetails { bool main_frame() const { return is_main_frame_; } - bool interstitial_page() const { return is_interstitial_page_; } - bool in_page_navigation() const { return is_in_page_navigation_; } int ssl_cert_id() const { return ssl_cert_id_; } @@ -50,15 +47,14 @@ class ProvisionalLoadDetails { int error_code_; GURL url_; bool is_main_frame_; - bool is_interstitial_page_; bool is_in_page_navigation_; int ssl_cert_id_; int ssl_cert_status_; int ssl_security_bits_; bool is_content_filtered_; - DISALLOW_EVIL_CONSTRUCTORS(ProvisionalLoadDetails); + DISALLOW_COPY_AND_ASSIGN(ProvisionalLoadDetails); }; -#endif // CHROME_BROWSER_PROVISIONAL_LOAD_DETAILS_H__ +#endif // CHROME_BROWSER_PROVISIONAL_LOAD_DETAILS_H_ |