summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-12-09 14:36:06 +0000
committerSteve Block <steveblock@google.com>2009-12-17 17:41:11 +0000
commitc351226de9a0ca9d369e44537f6c9ad6606bd219 (patch)
tree7ec169e9433ccd7bde9fb57089d639211bfe25ef /WebKit/android/WebCoreSupport
parent7857d3718de9ebd025de4cfd7c8b0e78af4ea21b (diff)
downloadexternal_webkit-c351226de9a0ca9d369e44537f6c9ad6606bd219.zip
external_webkit-c351226de9a0ca9d369e44537f6c9ad6606bd219.tar.gz
external_webkit-c351226de9a0ca9d369e44537f6c9ad6606bd219.tar.bz2
Merge webkit.org at r51976 : Changes to InspectorController.
See http://trac.webkit.org/changeset/51631 Change-Id: Ic0973105e04df1023d4df6f6e1d20052e869ac4a
Diffstat (limited to 'WebKit/android/WebCoreSupport')
-rw-r--r--WebKit/android/WebCoreSupport/InspectorClientAndroid.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/WebKit/android/WebCoreSupport/InspectorClientAndroid.h b/WebKit/android/WebCoreSupport/InspectorClientAndroid.h
index c8d2fcd..6feb2d7 100644
--- a/WebKit/android/WebCoreSupport/InspectorClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/InspectorClientAndroid.h
@@ -52,11 +52,9 @@ public:
virtual void hideHighlight() {}
virtual void inspectedURLChanged(const String& newURL) {}
-
- // new as of 38068
- virtual void populateSetting(const String&, InspectorController::Setting&) {}
- virtual void storeSetting(const String&, const InspectorController::Setting&) {}
- virtual void removeSetting(const String&) {}
+
+ virtual void populateSetting(const String& key, String* value) {}
+ virtual void storeSetting(const String& key, const String& value) {}
virtual String hiddenPanels() { return String(); }
virtual void inspectorWindowObjectCleared() {}
};