summaryrefslogtreecommitdiffstats
path: root/chrome/browser/navigation_controller.h
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-17 17:16:24 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-17 17:16:24 +0000
commitf072d2ce55ac96dda187eb2240f56bbfaa93fb4b (patch)
treefcf3b529a350948fed02fb79068d7b86f314f1b0 /chrome/browser/navigation_controller.h
parent3b95b86342778c3a18b70158280332c0601516c9 (diff)
downloadchromium_src-f072d2ce55ac96dda187eb2240f56bbfaa93fb4b.zip
chromium_src-f072d2ce55ac96dda187eb2240f56bbfaa93fb4b.tar.gz
chromium_src-f072d2ce55ac96dda187eb2240f56bbfaa93fb4b.tar.bz2
Delete the provisional load commit notification since it duplicates the nav entry committed notification.
I had to add some more stuff to the nav entry committed structure which now looks suspiciously like the provisional load details structure. I'll see how I can improve this in a future pass. I used the new NotificationRegistrar to automatically unregister for notifications in the SSL manager, which reduces some code. Review URL: http://codereview.chromium.org/3095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/navigation_controller.h')
-rw-r--r--chrome/browser/navigation_controller.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/chrome/browser/navigation_controller.h b/chrome/browser/navigation_controller.h
index f0e6096..0e1b5919 100644
--- a/chrome/browser/navigation_controller.h
+++ b/chrome/browser/navigation_controller.h
@@ -41,6 +41,8 @@ class NavigationController {
};
// Provides the details for a NOTIFY_NAV_ENTRY_COMMITTED notification.
+ // TODO(brettw) this mostly duplicates ProvisionalLoadDetails, it would be
+ // nice to unify these somehow.
struct LoadCommittedDetails {
// By default, the entry will be filled according to a new main frame
// navigation.
@@ -48,7 +50,8 @@ class NavigationController {
: entry(NULL),
is_auto(false),
is_in_page(false),
- is_main_frame(true) {
+ is_main_frame(true),
+ is_interstitial(false) {
}
// The committed entry. This will be the active entry in the controller.
@@ -72,6 +75,16 @@ 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;
+
+ // When the committed load is a web page from the renderer, this string
+ // specifies the security state if the page is secure.
+ // See ViewHostMsg_FrameNavigate_Params.security_info, where it comes from.
+ // Use SSLManager::DeserializeSecurityInfo to decode it.
+ std::string serialized_security_info;
+
// Returns whether the user probably felt like they navigated somewhere new.
// We often need this logic for showing or hiding something, and this
// returns true only for main frame loads that the user initiated, that go