Show IDN in error screens (DNS failure etc.)

chrome/browser/chromeos/offline/offline_load_page.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 "chrome/browser/chromeos/offline/offline_load_page.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
+#include "base/prefs/pref_service.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "chrome/common/localized_error.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
 #include "grit/theme_resources.h"
@@ skipping 57 matching lines @@
 
   // Extension service does not exist in test.
   if (extensions_service)
     extension = extensions_service->extensions()->GetHostedAppByURL(url_);
 
   if (extension && !extension->from_bookmark()) {
     LocalizedError::GetAppErrorStrings(url_, extension, &error_strings);
     resource_id = IDR_OFFLINE_APP_LOAD_HTML;
   } else {
     const std::string locale = g_browser_process->GetApplicationLocale();
+    const std::string accept_languages =
+        profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
     LocalizedError::GetStrings(net::ERR_INTERNET_DISCONNECTED,
                                net::kErrorDomain, url_, false, locale,
-                               &error_strings);
+                               accept_languages, &error_strings);
     resource_id = IDR_OFFLINE_NET_LOAD_HTML;
   }
 
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           resource_id));
   // "t" is the id of the templates root node.
   return webui::GetTemplatesHtml(template_html, &error_strings, "t");
 }
 
@@ skipping 43 matching lines @@
   const bool online = type != net::NetworkChangeNotifier::CONNECTION_NONE;
   DVLOG(1) << "ConnectionTypeObserver notification received: state="
            << (online ? "online" : "offline");
   if (online) {
     net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
     interstitial_page_->Proceed();
   }
 }
 
 }  // namespace chromeos