From c351226de9a0ca9d369e44537f6c9ad6606bd219 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 9 Dec 2009 14:36:06 +0000 Subject: Merge webkit.org at r51976 : Changes to InspectorController. See http://trac.webkit.org/changeset/51631 Change-Id: Ic0973105e04df1023d4df6f6e1d20052e869ac4a --- WebKit/android/WebCoreSupport/InspectorClientAndroid.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'WebKit/android/WebCoreSupport') 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() {} }; -- cgit v1.1