Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / base / webui / web_ui_util.cc

diff --git a/src/ui/base/webui/web_ui_util.cc b/src/ui/base/webui/web_ui_util.cc
index d901491..56c84f7 100644 (file)
--- a/src/ui/base/webui/web_ui_util.cc
+++ b/src/ui/base/webui/web_ui_util.cc
@@ -140,9 +140,9 @@ void SetFontAndTextDirection(base::DictionaryValue* localized_strings) {
 
   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.
+// TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced
+// into Ozone: crbug.com/320050
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
   font_family = ui::ResourceBundle::GetSharedInstance().GetFont(
       ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family;
 #endif