← Back to branch summary

~abreu-alexandre/oxide/add-ua-to-downloadrequested

« back to all changes in this revision

Viewing changes to shared/browser/oxide_web_preferences.cc

  • Committer: Chris Coulson
  • Date: 2014-07-18 22:41:10 UTC
  • mfrom: (640.1.18 canary)
  • Revision ID: chris.coulson@canonical.com-20140718224110-z2gzn68mk8ti3u2j
Bump Chromium rev to 38.0.2096.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/oxide_web_preferences.cc
19
19
 
20
20
#include "base/logging.h"
21
21
#include "base/strings/utf_string_conversions.h"
22
 
#include "webkit/common/webpreferences.h"
 
22
#include "content/public/common/web_preferences.h"
23
23
 
24
24
#include "oxide_web_preferences_observer.h"
25
25
 
185
185
  NotifyObserversOfChange();
186
186
}
187
187
 
188
 
void WebPreferences::ApplyToWebkitPrefs(::WebPreferences* prefs) {
189
 
  prefs->standard_font_family_map[webkit_glue::kCommonScript] =
 
188
void WebPreferences::ApplyToWebkitPrefs(content::WebPreferences* prefs) {
 
189
  prefs->standard_font_family_map[content::kCommonScript] =
190
190
      standard_font_family_;
191
 
  prefs->fixed_font_family_map[webkit_glue::kCommonScript] =
 
191
  prefs->fixed_font_family_map[content::kCommonScript] =
192
192
      fixed_font_family_;
193
 
  prefs->serif_font_family_map[webkit_glue::kCommonScript] =
 
193
  prefs->serif_font_family_map[content::kCommonScript] =
194
194
      serif_font_family_;
195
 
  prefs->sans_serif_font_family_map[webkit_glue::kCommonScript] =
 
195
  prefs->sans_serif_font_family_map[content::kCommonScript] =
196
196
      sans_serif_font_family_;
197
197
 
198
198
  prefs->default_encoding = default_encoding_;