diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 18:50:37 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 18:50:37 +0000 |
| commit | 4bda39710e4b3b88563b0d25b48fb8118df4d745 (patch) | |
| tree | eab74da15865d61bf6c74382b2f624df30c910c7 /webkit/glue/webpreferences.h | |
| parent | c82aec11bac4bb3506aa2da55d831a482b303196 (diff) | |
| download | chromium_src-4bda39710e4b3b88563b0d25b48fb8118df4d745.zip chromium_src-4bda39710e4b3b88563b0d25b48fb8118df4d745.tar.gz chromium_src-4bda39710e4b3b88563b0d25b48fb8118df4d745.tar.bz2 | |
glue/webpreferences: use string16 for font names
And fix the users.
BUG=23581
Review URL: http://codereview.chromium.org/5774005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webpreferences.h')
| -rw-r--r-- | webkit/glue/webpreferences.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index 6cb8044..8ee4ce8 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -13,6 +13,8 @@ #include <string> #include <vector> + +#include "base/string16.h" #include "googleurl/src/gurl.h" namespace WebKit { @@ -20,12 +22,12 @@ class WebView; } struct WebPreferences { - std::wstring standard_font_family; - std::wstring fixed_font_family; - std::wstring serif_font_family; - std::wstring sans_serif_font_family; - std::wstring cursive_font_family; - std::wstring fantasy_font_family; + string16 standard_font_family; + string16 fixed_font_family; + string16 serif_font_family; + string16 sans_serif_font_family; + string16 cursive_font_family; + string16 fantasy_font_family; int default_font_size; int default_fixed_font_size; int minimum_font_size; |