| 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 3edd66ce1ca2d521ec85f33147a2a8384250da0a..1cf2fe52ca84e160b3fa61d1c2ada7397f4eb1e7 100644
|
| --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
|
| +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
|
| @@ -23,11 +23,11 @@
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "content/public/common/webpreferences.h"
|
| #include "grit/locale_settings.h"
|
| #include "grit/platform_locale_settings.h"
|
| #include "third_party/icu/source/common/unicode/uchar.h"
|
| #include "third_party/icu/source/common/unicode/uscript.h"
|
| -#include "webkit/common/webpreferences.h"
|
|
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES)
|
| #include "chrome/browser/themes/theme_service.h"
|
| @@ -264,7 +264,7 @@ void OverrideFontFamily(WebPreferences* prefs,
|
| const std::string& generic_family,
|
| const std::string& script,
|
| const std::string& pref_value) {
|
| - webkit_glue::ScriptFontFamilyMap* map = NULL;
|
| + content::ScriptFontFamilyMap* map = NULL;
|
| if (generic_family == "standard")
|
| map = &prefs->standard_font_family_map;
|
| else if (generic_family == "fixed")
|
|
|