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

2 files changed, 8 insertions, 3 deletions

diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index a36a761..0db217c 100644..100755
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -92,8 +92,10 @@ void WebPreferences::Apply(WebView* web_view) const {
   // on command line.
   settings->setShowDebugBorders(show_composited_layer_borders);
 
-  // Web inspector settings need to be passed in differently.
-  web_view->setInspectorSettings(WebString::fromUTF8(inspector_settings));
+  for (WebInspectorPreferences::const_iterator it = inspector_settings.begin();
+       it != inspector_settings.end(); ++it)
+    web_view->setInspectorSetting(WebString::fromUTF8(it->first),
+                                  WebString::fromUTF8(it->second));
 
   // Tabs to link is not part of the settings. WebCore calls
   // ChromeClient::tabsToLinks which is part of the glue code.
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;