| Index: ppapi/shared_impl/ppapi_preferences.h
|
| diff --git a/ppapi/shared_impl/ppapi_preferences.h b/ppapi/shared_impl/ppapi_preferences.h
|
| index d3fad965a3bb141099607efae0318f170eb38968..023d0671c7a5f4eeac79ec6aceea8a11265b6605 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 "content/public/common/webpreferences.h"
|
| #include "ppapi/shared_impl/ppapi_shared_export.h"
|
| -#include "webkit/common/webpreferences.h"
|
|
|
| struct WebPreferences;
|
|
|
| @@ -18,10 +18,10 @@ struct PPAPI_SHARED_EXPORT Preferences {
|
| explicit Preferences(const WebPreferences& prefs);
|
| ~Preferences();
|
|
|
| - webkit_glue::ScriptFontFamilyMap standard_font_family_map;
|
| - webkit_glue::ScriptFontFamilyMap fixed_font_family_map;
|
| - webkit_glue::ScriptFontFamilyMap serif_font_family_map;
|
| - webkit_glue::ScriptFontFamilyMap sans_serif_font_family_map;
|
| + content::ScriptFontFamilyMap standard_font_family_map;
|
| + content::ScriptFontFamilyMap fixed_font_family_map;
|
| + content::ScriptFontFamilyMap serif_font_family_map;
|
| + content::ScriptFontFamilyMap sans_serif_font_family_map;
|
| int default_font_size;
|
| int default_fixed_font_size;
|
| int number_of_cpu_cores;
|
|
|