Index: chrome/browser/ui/prefs/prefs_tab_helper.cc |
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc |
index 43f262ccd208621b23f02cfdf8db475c3d2770d5..62396a3d93be1a95c3b1f7acdfa6b34814a9e139 100644 |
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc |
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc |
@@ -137,7 +137,6 @@ ALL_FONT_SCRIPTS(WEBKIT_WEBPREFS_FONTS_STANDARD) |
} |
} |
} |
-#endif // !defined(OS_ANDROID) |
// Registers |obs| to observe per-script font prefs under the path |map_name|. |
// On android, there's no exposed way to change these prefs, so we can save |
@@ -155,6 +154,7 @@ void RegisterFontFamilyMapObserver( |
registrar->Add(base::StringPrintf("%s.%s", map_name, script), obs); |
} |
} |
+#endif // !defined(OS_ANDROID) |
#if defined(OS_WIN) |
// On Windows with antialising we want to use an alternate fixed font like |
@@ -373,6 +373,7 @@ class PrefWatcher : public KeyedService { |
pref_change_registrar_.Add(pref_name, webkit_callback); |
} |
+#if !defined(OS_ANDROID) |
RegisterFontFamilyMapObserver(&pref_change_registrar_, |
prefs::kWebKitStandardFontFamilyMap, |
webkit_callback); |
@@ -394,6 +395,7 @@ class PrefWatcher : public KeyedService { |
RegisterFontFamilyMapObserver(&pref_change_registrar_, |
prefs::kWebKitPictographFontFamilyMap, |
webkit_callback); |
+#endif // !defined(OS_ANDROID) |
} |
static PrefWatcher* Get(Profile* profile); |