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

Unified Diff: chrome/renderer/navigation_state.h

Issue 159575: Move alternate error page loading out of WebFrame.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/errorpage_uitest.cc ('k') | chrome/renderer/render_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/navigation_state.h
===================================================================
--- chrome/renderer/navigation_state.h (revision 22154)
+++ chrome/renderer/navigation_state.h (working copy)
@@ -9,6 +9,7 @@
#include "base/time.h"
#include "chrome/common/page_transition_types.h"
#include "webkit/api/public/WebDataSource.h"
+#include "webkit/glue/alt_error_page_resource_fetcher.h"
#include "webkit/glue/password_form.h"
#include "webkit/glue/searchable_form_data.h"
@@ -36,9 +37,6 @@
// Contains the page_id for this navigation or -1 if there is none yet.
int32 pending_page_id() const { return pending_page_id_; }
- // Is this a new navigation?
- bool is_new_navigation() const { return pending_page_id_ == -1; }
-
// Contains the transition type that the browser specified when it
// initiated the load.
PageTransition::Type transition_type() const { return transition_type_; }
@@ -132,6 +130,13 @@
password_form_data_.reset(data);
}
+ webkit_glue::AltErrorPageResourceFetcher* alt_error_page_fetcher() const {
+ return alt_error_page_fetcher_.get();
+ }
+ void set_alt_error_page_fetcher(webkit_glue::AltErrorPageResourceFetcher* f) {
+ alt_error_page_fetcher_.reset(f);
+ }
+
const std::string& security_info() const {
return security_info_;
}
@@ -166,6 +171,7 @@
int32 pending_page_id_;
scoped_ptr<webkit_glue::SearchableFormData> searchable_form_data_;
scoped_ptr<webkit_glue::PasswordForm> password_form_data_;
+ scoped_ptr<webkit_glue::AltErrorPageResourceFetcher> alt_error_page_fetcher_;
std::string security_info_;
DISALLOW_COPY_AND_ASSIGN(NavigationState);
« no previous file with comments | « chrome/browser/errorpage_uitest.cc ('k') | chrome/renderer/render_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698