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

webkit/glue/alt_error_page_resource_fetcher.h

 // Copyright (c) 2006-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 WEBKIT_GLUE_ALT_ERROR_PAGE_RESOURCE_FETCHER_H_
 #define WEBKIT_GLUE_ALT_ERROR_PAGE_RESOURCE_FETCHER_H_
 
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "googleurl/src/gurl.h"
 
 class WebFrame;
 
 namespace WebKit {
 class WebURLResponse;
 }
 
 namespace webkit_glue {
 
 class ResourceFetcherWithTimeout;
 
 // Used for downloading alternate dns error pages. Once downloading is done
 // (or fails), the webview delegate is notified.
 class AltErrorPageResourceFetcher {
  public:
   // This will be called when the alternative error page has been fetched,
   // successfully or not.  If there is a failure, the second parameter (the
   // data) will be empty.
-  typedef Callback2<const GURL&, const std::string&>::Type Callback;
+  typedef Callback3<WebFrame*, const GURL&, const std::string&>::Type Callback;
 
   AltErrorPageResourceFetcher(const GURL& url,
                               WebFrame* frame,
                               const GURL& unreachable_url,
                               Callback* callback);
   ~AltErrorPageResourceFetcher();
 
   // Stop any pending loads.
   void Cancel();
 
  private:
   void OnURLFetchComplete(const WebKit::WebURLResponse& response,
                           const std::string& data);
 
   // Does the actual fetching.
   scoped_ptr<ResourceFetcherWithTimeout> fetcher_;
 
+  WebFrame* frame_;
   scoped_ptr<Callback> callback_;
 
   // The "unreachable url" associated with this load.  If there's an error
   // talking with the alt 404 page server, we need this to complete the
   // original load.
   GURL unreachable_url_;
 
   DISALLOW_COPY_AND_ASSIGN(AltErrorPageResourceFetcher);
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_ALT_ERROR_PAGE_RESOURCE_FETCHER_H_