Show IDN in error screens (DNS failure etc.)

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 115 matching lines @@
 #include "content/renderer/websharedworker_proxy.h"
 #include "media/audio/audio_output_device.h"
 #include "media/base/audio_renderer_mixer_input.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media_switches.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "net/base/data_url.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
+#include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/http/http_util.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
 #include "third_party/WebKit/public/platform/WebDragData.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 #include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
@@ skipping 2046 matching lines @@
     const WebURLError& error,
     const std::string& html,
     bool replace) {
   std::string alt_html;
   const std::string* error_html;
 
   if (!html.empty()) {
     error_html = &html;
   } else {
     GetContentClient()->renderer()->GetNavigationErrorStrings(
-        frame, failed_request, error, &alt_html, NULL);
+        frame, failed_request, error, renderer_preferences_.accept_languages,
+        &alt_html, NULL);
     error_html = &alt_html;
   }
 
   frame->loadHTMLString(*error_html,
                         GURL(kUnreachableWebDataURL),
                         error.unreachableURL,
                         replace);
 }
 
 bool RenderViewImpl::RunJavaScriptMessage(JavaScriptMessageType type,
@@ skipping 914 matching lines @@
 
   SSLStatus ssl_status;
   DeserializeSecurityInfo(security_info,
                           &ssl_status.cert_id,
                           &ssl_status.cert_status,
                           &ssl_status.security_bits,
                           &ssl_status.connection_status);
   return ssl_status;
 }
 
+const std::string& RenderViewImpl::GetAcceptLanguages() const {
+  return renderer_preferences_.accept_languages;
+}
+
 WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
     WebFrame* frame, WebDataSource::ExtraData* extraData,
     const WebURLRequest& request, WebNavigationType type,
     WebNavigationPolicy default_policy, bool is_redirect) {
   if (request.url() != GURL(kSwappedOutURL) &&
       GetContentClient()->renderer()->HandleNavigation(frame, request, type,
                                                        default_policy,
                                                        is_redirect)) {
     return WebKit::WebNavigationPolicyIgnore;
   }
@@ skipping 469 matching lines @@
        EqualsASCII(failed_request.httpMethod(), "POST"));
 
   ViewHostMsg_DidFailProvisionalLoadWithError_Params params;
   params.frame_id = frame->identifier();
   params.is_main_frame = !frame->parent();
   params.error_code = error.reason;
   GetContentClient()->renderer()->GetNavigationErrorStrings(
       frame,
       failed_request,
       error,
+      renderer_preferences_.accept_languages,
       NULL,
       &params.error_description);
   params.url = error.unreachableURL;
   params.showing_repost_interstitial = show_repost_interstitial;
   Send(new ViewHostMsg_DidFailProvisionalLoadWithError(
       routing_id_, params));
 
   // Don't display an error page if this is simply a cancelled load.  Aside
   // from being dumb, WebCore doesn't expect it and it will cause a crash.
   if (error.reason == net::ERR_ABORTED)
@@ skipping 226 matching lines @@
 
 
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidFailLoad(frame, error));
 
   const WebURLRequest& failed_request = ds->request();
   string16 error_description;
   GetContentClient()->renderer()->GetNavigationErrorStrings(
       frame,
       failed_request,
       error,
+      renderer_preferences_.accept_languages,
       NULL,
       &error_description);
   Send(new ViewHostMsg_DidFailLoadWithError(routing_id_,
                                             frame->identifier(),
                                             failed_request.url(),
                                             !frame->parent(),
                                             error.reason,
                                             error_description));
 }
 
@@ skipping 676 matching lines @@
   if (!alternate_error_page_url_.is_valid())
     return GURL();
 
   // Strip query params from the failed URL.
   GURL::Replacements remove_params;
   remove_params.ClearUsername();
   remove_params.ClearPassword();
   remove_params.ClearQuery();
   remove_params.ClearRef();
   const GURL url_to_send = failed_url.ReplaceComponents(remove_params);
-  std::string spec_to_send = url_to_send.spec();
+  std::string spec_to_send = UTF16ToUTF8(net::FormatUrl(url_to_send,
+      renderer_preferences_.accept_languages, net::kFormatUrlOmitNothing,
+      net::UnescapeRule::NORMAL, NULL, NULL, NULL));

[mmenke, 2013/09/26 16:23:01]

Believe this formatting violates the style guide.  Each line with parameters to
the same function should be lined up.  Just move "url_to_send," to the next line
to fix.

[mmenke, 2013/09/26 16:23:01]

I've reached out to the Link Doctor team to make sure this is fine on their end.
 Hope to hear back later today.

[mmenke, 2013/09/26 18:28:22]

After talking to the Link Doctor team, it looks like Link Doctor really does not
handle IDN domain names well, but it works better with the punycode versions, so
let's leave this as it was before, for now.  :(

[yuusuke, 2013/09/27 14:16:52]

Done.

   // Notify link doctor of the url truncation by sending of "?" at the end.
   if (failed_url.has_query())
     spec_to_send.append("?");
 
   // Construct the query params to send to link doctor.
   std::string params(alternate_error_page_url_.query());
   params.append("&url=");
   params.append(net::EscapeQueryParamValue(spec_to_send, true));
   params.append("&sourceid=chrome");
   params.append("&error=");
@@ skipping 1927 matching lines @@
   for (size_t i = 0; i < icon_urls.size(); i++) {
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content