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

Unified Diff: chrome/renderer/net/net_error_helper_core.h

Issue 228803002: Revert 255617, due to it not tracking use of the link doctor page properly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Minor header changes Created 6 years, 8 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/renderer/net/net_error_helper.cc ('k') | chrome/renderer/net/net_error_helper_core.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/net/net_error_helper_core.h
===================================================================
--- chrome/renderer/net/net_error_helper_core.h (revision 261404)
+++ chrome/renderer/net/net_error_helper_core.h (working copy)
@@ -11,14 +11,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.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;
}
@@ -44,11 +39,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,
@@ -66,13 +59,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;
// Starts a reload of the page in the observed frame.
virtual void ReloadPage() = 0;
@@ -107,19 +97,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;
+ }
// Notifies |this| that the network's online status changed.
// Handler for NetworkStateChanged notification from the browser process. If
// the network state changes to online, this method is responsible for
@@ -157,7 +143,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;
@@ -181,11 +166,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_;
bool auto_reload_enabled_;
scoped_ptr<base::Timer> auto_reload_timer_;
« no previous file with comments | « chrome/renderer/net/net_error_helper.cc ('k') | chrome/renderer/net/net_error_helper_core.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698