Move alternate error page loading out of WebFrame....

chrome/renderer/navigation_state.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_RENDERER_NAVIGATION_STATE_H_
 #define CHROME_RENDERER_NAVIGATION_STATE_H_
 
 #include "base/scoped_ptr.h"
 #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"
 
 // The RenderView stores an instance of this class in the "extra data" of each
 // WebDataSource (see RenderView::DidCreateDataSource).
 class NavigationState : public WebKit::WebDataSource::ExtraData {
  public:
   static NavigationState* CreateBrowserInitiated(
       int32 pending_page_id,
       PageTransition::Type transition_type,
       base::Time request_time) {
     return new NavigationState(transition_type, request_time, false,
                                pending_page_id);
   }
 
   static NavigationState* CreateContentInitiated() {
     // We assume navigations initiated by content are link clicks.
     return new NavigationState(PageTransition::LINK, base::Time(), true, -1);
   }
 
   static NavigationState* FromDataSource(WebKit::WebDataSource* ds) {
     return static_cast<NavigationState*>(ds->extraData());
   }
 
   // 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_; }
   void set_transition_type(PageTransition::Type type) {
     transition_type_ = type;
   }
 
   // The time that this navigation was requested.
   const base::Time& request_time() const {
     return request_time_;
@@ skipping 73 matching lines @@
     searchable_form_data_.reset(data);
   }
 
   webkit_glue::PasswordForm* password_form_data() const {
     return password_form_data_.get();
   }
   void set_password_form_data(webkit_glue::PasswordForm* data) {
     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_;
   }
   void set_security_info(const std::string& security_info) {
     security_info_ = security_info;
   }
 
  private:
   NavigationState(PageTransition::Type transition_type,
                   const base::Time& request_time,
@@ skipping 14 matching lines @@
   base::Time finish_document_load_time_;
   base::Time finish_load_time_;
   base::Time first_paint_time_;
   base::Time first_paint_after_load_time_;
   bool load_histograms_recorded_;
   bool request_committed_;
   bool is_content_initiated_;
   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);
 };
 
 #endif  // CHROME_RENDERER_NAVIGATION_STATE_H_