New network error pages: Only show an icon when in iframe

chrome/common/localized_error.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/common/localized_error.h"
 
+#include "base/base64.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/web_ui_util.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 using WebKit::WebURLError;
 
 // Some error pages have no details.
@@ skipping 609 matching lines @@
       DictionaryValue* suggest_learn_more = new DictionaryValue;
       // There's only a body for this suggestion.
       suggest_learn_more->SetString("body",
           l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY));
       suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
       suggestions->Append(suggest_learn_more);
     }
   }
 
   error_strings->Set("suggestions", suggestions);
+
+  std::string resource_base64;
+  if (base::Base64Encode(
+          ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
+              IDR_ERROR_NETWORK_GENERIC, ui::GetMaxScaleFactor()),

[Nico, 2013/04/16 23:15:11]

This is not correct. This needs to be a -webkit-image-set() with one image per
scale factor.

Can you just use a chrome://theme/RESOURCE_ID img src instead of lining the
asset? Then you can use the @2x suffix too.

If that's not an option for some reason, I think our html processor
automatically inlines images into data urls if you put a relative path to a png
into the html file, so there's no need to write code for this anyways.

(Example: with a resource url:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/res...
(the resource packer will insert -webkit-image-set() automatically, and attach
"@2x" for the hidpi version)

Example with a relative path:
https://code.google.com/p/chromium/codesearch#chromium/src/ui/webui/resources...
I think here too the processor will include a -webkit-image-set() thing
automatically if there's a png with the same name in a "2x" subfolder)

[mmenke, 2013/04/16 23:23:02]

This is run in a generic renderer process, and does not have access to chrome://
URLs.

Everything it uses has to be embedded in the page when it's loaded.

We could embed resources of different sizes in the HTML, though I really don't
like that solution.

I'm open to other ideas.

[mmenke, 2013/04/16 23:27:18]

Sorry...Just skimmed your response.  I'll go ahead and embed the images. 
They're small, It just seems wrong.

[mmenke, 2013/04/16 23:57:30]

I've embedded the images.

+          &resource_base64)) {
+    base::StringValue* data_url =
+        new base::StringValue("data:image/png;base64," + resource_base64);
+    error_strings->Set("image", data_url);
+  }
 }
 
 string16 LocalizedError::GetErrorDetails(const WebKit::WebURLError& error) {
   const LocalizedErrorMap* error_map =
       LookupErrorMap(error.domain.utf8(), error.reason);
   if (error_map)
     return l10n_util::GetStringUTF16(error_map->details_resource_id);
   else
     return l10n_util::GetStringUTF16(IDS_ERRORPAGES_DETAILS_UNKNOWN);
 }
@@ skipping 56 matching lines @@
 #if defined(OS_CHROMEOS)
   GURL learn_more_url(kAppWarningLearnMoreUrl);
   DictionaryValue* suggest_learn_more = new DictionaryValue();
   suggest_learn_more->SetString("msg",
                                 l10n_util::GetStringUTF16(
                                     IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY));
   suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
   error_strings->Set("suggestionsLearnMore", suggest_learn_more);
 #endif  // defined(OS_CHROMEOS)
 }