Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1039)

Unified Diff: ppapi/shared_impl/ppapi_preferences.h

Issue 357203003: Move webpreferences.* from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android fix - webview() -> web_view Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/shared_impl/DEPS ('k') | ppapi/shared_impl/ppapi_preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/shared_impl/ppapi_preferences.h
diff --git a/ppapi/shared_impl/ppapi_preferences.h b/ppapi/shared_impl/ppapi_preferences.h
index 0ef91362f537c9d9576aacb2234f45f94a74bb96..8858bd9b2ff9c9bc2584fad0a1c924f9eee301ca 100644
--- a/ppapi/shared_impl/ppapi_preferences.h
+++ b/ppapi/shared_impl/ppapi_preferences.h
@@ -5,23 +5,25 @@
#ifndef PPAPI_SHARED_IMPL_PPAPI_PREFERENCES_H_
#define PPAPI_SHARED_IMPL_PPAPI_PREFERENCES_H_
-#include "ppapi/shared_impl/ppapi_shared_export.h"
-#include "webkit/common/webpreferences.h"
+#include <map>
+#include <string>
-struct WebPreferences;
+#include "base/strings/string16.h"
+#include "ppapi/shared_impl/ppapi_shared_export.h"
namespace ppapi {
struct PPAPI_SHARED_EXPORT Preferences {
public:
+ typedef std::map<std::string, base::string16> ScriptFontFamilyMap;
+
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;
+ ScriptFontFamilyMap standard_font_family_map;
+ ScriptFontFamilyMap fixed_font_family_map;
+ ScriptFontFamilyMap serif_font_family_map;
+ ScriptFontFamilyMap sans_serif_font_family_map;
int default_font_size;
int default_fixed_font_size;
int number_of_cpu_cores;
« no previous file with comments | « ppapi/shared_impl/DEPS ('k') | ppapi/shared_impl/ppapi_preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698