Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1510)

Unified Diff: chrome/browser/ui/webui/web_ui_util.cc

Issue 11881055: Simplify WebUI data sources. Currently WebUI data sources implement a URLDataSourceDelegate interfa… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix issue in about_ui exposed by cros tests Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/web_ui_util.cc
===================================================================
--- chrome/browser/ui/webui/web_ui_util.cc (revision 176942)
+++ chrome/browser/ui/webui/web_ui_util.cc (working copy)
@@ -7,18 +7,28 @@
#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/values.h"
#include "chrome/browser/disposition_utils.h"
#include "googleurl/src/gurl.h"
#include "net/base/escape.h"
+#include "grit/platform_locale_settings.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/codec/png_codec.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/base/l10n/l10n_util.h"
-#include "base/debug/trace_event.h"
+#if defined (TOOLKIT_GTK)
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/font.h"
+#endif
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
+
namespace {
struct ScaleFactorMap {
@@ -121,4 +131,32 @@
}
}
+// static
+void SetFontAndTextDirection(DictionaryValue* localized_strings) {
+ int web_font_family_id = IDS_WEB_FONT_FAMILY;
+ int web_font_size_id = IDS_WEB_FONT_SIZE;
+#if defined(OS_WIN)
+ // Vary font settings for Windows XP.
+ if (base::win::GetVersion() < base::win::VERSION_VISTA) {
+ web_font_family_id = IDS_WEB_FONT_FAMILY_XP;
+ web_font_size_id = IDS_WEB_FONT_SIZE_XP;
+ }
+#endif
+
+ std::string font_family = l10n_util::GetStringUTF8(web_font_family_id);
+
+#if defined(TOOLKIT_GTK)
+ // Use the system font on Linux/GTK. Keep the hard-coded font families as
+ // backup in case for some crazy reason this one isn't available.
+ font_family = ui::ResourceBundle::GetSharedInstance().GetFont(
+ ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family;
+#endif
+
+ localized_strings->SetString("fontfamily", font_family);
+ localized_strings->SetString("fontsize",
+ l10n_util::GetStringUTF8(web_font_size_id));
+ localized_strings->SetString("textdirection",
+ base::i18n::IsRTL() ? "rtl" : "ltr");
+}
+
} // namespace web_ui_util

Powered by Google App Engine
This is Rietveld 408576698