Index: trunk/src/chrome/renderer/net/net_error_helper_core.h |
=================================================================== |
--- trunk/src/chrome/renderer/net/net_error_helper_core.h (revision 254240) |
+++ trunk/src/chrome/renderer/net/net_error_helper_core.h (working copy) |
@@ -7,16 +7,10 @@ |
#include <string> |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
-#include "chrome/common/localized_error.h" |
#include "chrome/common/net/net_error_info.h" |
#include "url/gurl.h" |
-namespace base { |
-class ListValue; |
-} |
- |
namespace blink { |
struct WebURLError; |
} |
@@ -42,11 +36,9 @@ |
class Delegate { |
public: |
// Generates an error page's HTML for the given error. |
- virtual void GenerateLocalizedErrorPage( |
- const blink::WebURLError& error, |
- bool is_failed_post, |
- scoped_ptr<LocalizedError::ErrorPageParams> params, |
- std::string* html) const = 0; |
+ virtual void GenerateLocalizedErrorPage(const blink::WebURLError& error, |
+ bool is_failed_post, |
+ std::string* html) const = 0; |
// Loads the given HTML in the main frame for use as an error page. |
virtual void LoadErrorPageInMainFrame(const std::string& html, |
@@ -61,13 +53,10 @@ |
// Fetches an error page and calls into OnErrorPageFetched when done. Any |
// previous fetch must either be canceled or finished before calling. Can't |
// be called synchronously after a previous fetch completes. |
- virtual void FetchNavigationCorrections( |
- const GURL& navigation_correction_url, |
- const std::string& navigation_correction_request_body) = 0; |
+ virtual void FetchErrorPage(const GURL& url) = 0; |
- // Cancels fetching navigation corrections. Does nothing if no fetch is |
- // ongoing. |
- virtual void CancelFetchNavigationCorrections() = 0; |
+ // Cancels an error page fetch. Does nothing if no fetch is ongoing. |
+ virtual void CancelFetchErrorPage() = 0; |
protected: |
virtual ~Delegate() {} |
@@ -97,19 +86,15 @@ |
// Called when an error page have has been retrieved over the network. |html| |
// must be an empty string on error. |
- void OnNavigationCorrectionsFetched(const std::string& corrections, |
- const std::string& accept_languages, |
- bool is_rtl); |
+ void OnAlternateErrorPageFetched(const std::string& html); |
// Notifies |this| that network error information from the browser process |
// has been received. |
void OnNetErrorInfo(chrome_common_net::DnsProbeStatus status); |
- void OnSetNavigationCorrectionInfo(const GURL& navigation_correction_url, |
- const std::string& language, |
- const std::string& country_code, |
- const std::string& api_key, |
- const GURL& search_url); |
+ void set_alt_error_page_url(const GURL& alt_error_page_url) { |
+ alt_error_page_url_ = alt_error_page_url; |
+ } |
private: |
struct ErrorPageInfo; |
@@ -123,7 +108,6 @@ |
FrameType frame_type, |
const blink::WebURLError& error, |
bool is_failed_post, |
- scoped_ptr<LocalizedError::ErrorPageParams> params, |
std::string* error_html); |
blink::WebURLError GetUpdatedError(const blink::WebURLError& error) const; |
@@ -141,11 +125,7 @@ |
// not an error page. |
scoped_ptr<ErrorPageInfo> committed_error_page_info_; |
- GURL navigation_correction_url_; |
- std::string language_; |
- std::string country_code_; |
- std::string api_key_; |
- GURL search_url_; |
+ GURL alt_error_page_url_; |
}; |
#endif // CHROME_RENDERER_NET_NET_ERROR_HELPER_CORE_H_ |