| Index: chrome/renderer/net/net_error_helper.cc
|
| diff --git a/chrome/renderer/net/net_error_helper.cc b/chrome/renderer/net/net_error_helper.cc
|
| index ca58825313a4958e7fa9410c302dad61f1331d8e..3a3c71f7e6e2bacff549fd2918d7dcfad46cdf11 100644
|
| --- a/chrome/renderer/net/net_error_helper.cc
|
| +++ b/chrome/renderer/net/net_error_helper.cc
|
| @@ -53,7 +53,6 @@ using error_page::DnsProbeStatusToString;
|
| using error_page::ErrorPageParams;
|
| using error_page::LocalizedError;
|
| using error_page::NetErrorHelperCore;
|
| -using error_page::OfflinePageStatus;
|
|
|
| namespace {
|
|
|
| @@ -155,7 +154,7 @@ bool NetErrorHelper::OnMessageReceived(const IPC::Message& message) {
|
| IPC_MESSAGE_HANDLER(ChromeViewMsg_SetNavigationCorrectionInfo,
|
| OnSetNavigationCorrectionInfo);
|
| #if defined(OS_ANDROID)
|
| - IPC_MESSAGE_HANDLER(ChromeViewMsg_SetOfflinePageInfo, OnSetOfflinePageInfo)
|
| + IPC_MESSAGE_HANDLER(ChromeViewMsg_SetHasOfflinePages, OnSetHasOfflinePages)
|
| #endif
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| @@ -183,13 +182,12 @@ void NetErrorHelper::GenerateLocalizedErrorPage(
|
| const blink::WebURLError& error,
|
| bool is_failed_post,
|
| bool can_show_network_diagnostics_dialog,
|
| - OfflinePageStatus offline_page_status,
|
| + bool has_offline_pages,
|
| scoped_ptr<ErrorPageParams> params,
|
| bool* reload_button_shown,
|
| bool* show_saved_copy_button_shown,
|
| bool* show_cached_copy_button_shown,
|
| bool* show_offline_pages_button_shown,
|
| - bool* show_offline_copy_button_shown,
|
| std::string* error_html) const {
|
| error_html->clear();
|
|
|
| @@ -203,7 +201,7 @@ void NetErrorHelper::GenerateLocalizedErrorPage(
|
| LocalizedError::GetStrings(
|
| error.reason, error.domain.utf8(), error.unreachableURL, is_failed_post,
|
| error.staleCopyInCache, can_show_network_diagnostics_dialog,
|
| - offline_page_status, RenderThread::Get()->GetLocale(),
|
| + has_offline_pages, RenderThread::Get()->GetLocale(),
|
| render_frame()->GetRenderView()->GetAcceptLanguages(),
|
| std::move(params), &error_strings);
|
| *reload_button_shown = error_strings.Get("reloadButton", nullptr);
|
| @@ -213,8 +211,6 @@ void NetErrorHelper::GenerateLocalizedErrorPage(
|
| error_strings.Get("cacheButton", nullptr);
|
| *show_offline_pages_button_shown =
|
| error_strings.Get("showOfflinePagesButton", nullptr);
|
| - *show_offline_copy_button_shown =
|
| - error_strings.Get("showOfflineCopyButton", nullptr);
|
| // "t" is the id of the template's root node.
|
| *error_html = webui::GetTemplatesHtml(template_html, &error_strings, "t");
|
| }
|
| @@ -234,7 +230,7 @@ void NetErrorHelper::EnablePageHelperFunctions() {
|
| void NetErrorHelper::UpdateErrorPage(const blink::WebURLError& error,
|
| bool is_failed_post,
|
| bool can_show_network_diagnostics_dialog,
|
| - OfflinePageStatus offline_page_status) {
|
| + bool has_offline_pages) {
|
| base::DictionaryValue error_strings;
|
| LocalizedError::GetStrings(
|
| error.reason,
|
| @@ -243,7 +239,7 @@ void NetErrorHelper::UpdateErrorPage(const blink::WebURLError& error,
|
| is_failed_post,
|
| error.staleCopyInCache,
|
| can_show_network_diagnostics_dialog,
|
| - offline_page_status,
|
| + has_offline_pages,
|
| RenderThread::Get()->GetLocale(),
|
| render_frame()->GetRenderView()->GetAcceptLanguages(),
|
| scoped_ptr<ErrorPageParams>(),
|
| @@ -336,13 +332,6 @@ void NetErrorHelper::ShowOfflinePages() {
|
| #endif // defined(OS_ANDROID)
|
| }
|
|
|
| -void NetErrorHelper::LoadOfflineCopy(const GURL& page_url) {
|
| -#if defined(OS_ANDROID)
|
| - render_frame()->Send(new ChromeViewHostMsg_LoadOfflineCopy(
|
| - render_frame()->GetRoutingID(), page_url));
|
| -#endif // defined(OS_ANDROID)
|
| -}
|
| -
|
| void NetErrorHelper::OnNetErrorInfo(int status_num) {
|
| DCHECK(status_num >= 0 && status_num < error_page::DNS_PROBE_MAX);
|
|
|
| @@ -388,8 +377,7 @@ void NetErrorHelper::OnTrackingRequestComplete(
|
| }
|
|
|
| #if defined(OS_ANDROID)
|
| -void NetErrorHelper::OnSetOfflinePageInfo(
|
| - OfflinePageStatus offline_page_status) {
|
| - core_->OnSetOfflinePageInfo(offline_page_status);
|
| +void NetErrorHelper::OnSetHasOfflinePages(bool has_offline_pages) {
|
| + core_->OnSetHasOfflinePages(has_offline_pages);
|
| }
|
| #endif // defined(OS_ANDROID)
|
|
|