Directly inline shared WebUI CSS declarations into the security and supervised user interstitials.

ui/base/webui/web_ui_util.cc

 // Copyright 2013 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 "ui/base/webui/web_ui_util.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/resources/grit/webui_resources.h"
 #include "ui/strings/grit/app_locale_settings.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "ui/base/font_helper_chromeos.h"
 #endif
@@ skipping 90 matching lines @@
             pos + 1, stripped_path.length() - pos - 1), &factor)) {
       // Strip scale factor specification from path.
       stripped_path.remove_suffix(stripped_path.length() - pos);
       stripped_path.CopyToString(path);
     }
     if (scale_factor)
       *scale_factor = factor;
   }
 }
 
+void SetTextDirection(base::DictionaryValue* localized_strings) {
+  localized_strings->SetString("fontfamily", GetFontFamily());
+  localized_strings->SetString("fontsize", GetFontSize());
+  localized_strings->SetString("textdirection", GetTextDirection());
+}
+
+std::string GetWebUICSSTextDefaults() {

[Dan Beam, 2015/01/21 19:21:41]

nit: GetWebUICssTextDefaults or GetWebUiCssTextDefaults

[Bernhard Bauer, 2015/01/21 22:47:50]

Ack, will do that tomorrow.

[Bernhard Bauer, 2015/01/22 10:12:35]

Done.

+  std::vector<std::string> placeholders;
+  placeholders.push_back(GetTextDirection());  // $1
+  placeholders.push_back(GetFontFamily());  // $2
+  placeholders.push_back(GetFontSize());  // $3
+
+  const ui::ResourceBundle& resource_bundle =
+      ui::ResourceBundle::GetSharedInstance();
+  const std::string& css_template =
+      resource_bundle.GetRawDataResource(IDR_WEBUI_CSS_TEXT_DEFAULTS)
+          .as_string();
+
+  return ReplaceStringPlaceholders(css_template, placeholders, nullptr);
+}
+
+void AppendWebUICSSTextDefaults(std::string* html) {
+  html->append("<style>");
+  html->append(GetWebUICSSTextDefaults());
+  html->append("</style>");
+}
+
 std::string GetFontFamily() {
   std::string font_family = l10n_util::GetStringUTF8(
 #if defined(OS_WIN)
       base::win::GetVersion() < base::win::VERSION_VISTA ?
           IDS_WEB_FONT_FAMILY_XP :
 #endif
           IDS_WEB_FONT_FAMILY);
 
 #if defined(OS_CHROMEOS)
   ui::ReplaceNotoSansWithRobotoIfEnabled(&font_family);
@@ skipping 15 matching lines @@
       base::win::GetVersion() < base::win::VERSION_VISTA ?
           IDS_WEB_FONT_SIZE_XP :
 #endif
           IDS_WEB_FONT_SIZE);
 }
 
 std::string GetTextDirection() {
   return base::i18n::IsRTL() ? "rtl" : "ltr";
 }
 
-void SetFontAndTextDirection(base::DictionaryValue* localized_strings) {
-  localized_strings->SetString("fontfamily", GetFontFamily());
-  localized_strings->SetString("fontsize", GetFontSize());
-  localized_strings->SetString("textdirection", GetTextDirection());
-}
-
 }  // namespace webui