diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 10:01:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:01:33 -0800 |
| commit | 56b9f7cfd39c86e2bb14b21320d63274a1e81b37 (patch) | |
| tree | 809b75c825c67586c4675902fa7ebb71c2d529d3 /WebKit/android | |
| parent | d2901b4f3c59a4df2c9676ace16a0c374d3f3be8 (diff) | |
| parent | 1e7237f82ba36a49bb7938c0552d6cf1ad56c3ad (diff) | |
| download | external_webkit-56b9f7cfd39c86e2bb14b21320d63274a1e81b37.zip external_webkit-56b9f7cfd39c86e2bb14b21320d63274a1e81b37.tar.gz external_webkit-56b9f7cfd39c86e2bb14b21320d63274a1e81b37.tar.bz2 | |
am 1e7237f8: am c351226d: Merge webkit.org at r51976 : Changes to InspectorController.
Merge commit '1e7237f82ba36a49bb7938c0552d6cf1ad56c3ad'
* commit '1e7237f82ba36a49bb7938c0552d6cf1ad56c3ad':
Merge webkit.org at r51976 : Changes to InspectorController.
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/WebCoreSupport/InspectorClientAndroid.h | 8 |
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() {} }; |