| Index: ppapi/shared_impl/ppapi_preferences.h
|
| diff --git a/ppapi/shared_impl/ppapi_preferences.h b/ppapi/shared_impl/ppapi_preferences.h
|
| index 8e0847c82056424f1bf1bef49a9723122640ca59..8cf61f24e3d9e37201c03ea22768bf3e4e06109e 100644
|
| --- a/ppapi/shared_impl/ppapi_preferences.h
|
| +++ b/ppapi/shared_impl/ppapi_preferences.h
|
| @@ -5,8 +5,8 @@
|
| #ifndef PPAPI_SHARED_IMPL_PPAPI_PREFERENCES_H_
|
| #define PPAPI_SHARED_IMPL_PPAPI_PREFERENCES_H_
|
|
|
| -#include "base/string16.h"
|
| #include "ppapi/shared_impl/ppapi_shared_export.h"
|
| +#include "webkit/glue/webpreferences.h"
|
|
|
| struct WebPreferences;
|
|
|
| @@ -18,10 +18,10 @@ struct PPAPI_SHARED_EXPORT Preferences {
|
| explicit Preferences(const WebPreferences& prefs);
|
| ~Preferences();
|
|
|
| - string16 standard_font_family;
|
| - string16 fixed_font_family;
|
| - string16 serif_font_family;
|
| - string16 sans_serif_font_family;
|
| + WebPreferences::ScriptFontFamilyMap standard_font_family_map;
|
| + WebPreferences::ScriptFontFamilyMap fixed_font_family_map;
|
| + WebPreferences::ScriptFontFamilyMap serif_font_family_map;
|
| + WebPreferences::ScriptFontFamilyMap sans_serif_font_family_map;
|
| int default_font_size;
|
| int default_fixed_font_size;
|
| };
|
|
|