summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webpreferences.h
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 10:20:14 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 10:20:14 +0000
commitc4e9890a10fb35a78247be5d204d77f512d7654c (patch)
tree721f8deca6173a7ea06f50e991597a2fde7269de /webkit/glue/webpreferences.h
parent0bda0e053a5d9dc61c6ab026b328873111eb2b81 (diff)
downloadchromium_src-c4e9890a10fb35a78247be5d204d77f512d7654c.zip
chromium_src-c4e9890a10fb35a78247be5d204d77f512d7654c.tar.gz
chromium_src-c4e9890a10fb35a78247be5d204d77f512d7654c.tar.bz2
DevTools: inspector settings are now serialized into map, not a string
WebKit roll 60462:60647 Original review: http://codereview.chromium.org/2422001 Review URL: http://codereview.chromium.org/2459002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webpreferences.h')
-rwxr-xr-x[-rw-r--r--]webkit/glue/webpreferences.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index ec52951..b34f938 100644..100755
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -12,6 +12,7 @@
#define WEBKIT_GLUE_WEBPREFERENCES_H__
#include <string>
+#include <vector>
#include "googleurl/src/gurl.h"
namespace WebKit {
@@ -37,7 +38,9 @@ struct WebPreferences {
bool plugins_enabled;
bool dom_paste_enabled;
bool developer_extras_enabled;
- std::string inspector_settings;
+ typedef std::vector<std::pair<std::string, std::string> >
+ WebInspectorPreferences;
+ WebInspectorPreferences inspector_settings;
bool site_specific_quirks_enabled;
bool shrinks_standalone_images_to_fit;
bool uses_universal_detector;