summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-13 18:40:32 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-13 18:40:32 +0000
commitc2d3052594e4efb4adfb71c2dcecd5fcd9ee1ea1 (patch)
tree486e8f3c53d599401d39c3dd4a81cea38c97e367 /webkit/glue
parent2fb6d466842f445078962a2f5aa4fa7af49d2313 (diff)
downloadchromium_src-c2d3052594e4efb4adfb71c2dcecd5fcd9ee1ea1.zip
chromium_src-c2d3052594e4efb4adfb71c2dcecd5fcd9ee1ea1.tar.gz
chromium_src-c2d3052594e4efb4adfb71c2dcecd5fcd9ee1ea1.tar.bz2
WebKit merge 40847-40875 Chrome side.
Review URL: http://codereview.chromium.org/21351 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/inspector_client_impl.cc5
-rw-r--r--webkit/glue/inspector_client_impl.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/webkit/glue/inspector_client_impl.cc b/webkit/glue/inspector_client_impl.cc
index f99795b..e997a73 100644
--- a/webkit/glue/inspector_client_impl.cc
+++ b/webkit/glue/inspector_client_impl.cc
@@ -169,6 +169,11 @@ String WebInspectorClient::localizedStringsURL() {
return String();
}
+String WebInspectorClient::hiddenPanels() {
+ NOTIMPLEMENTED();
+ return String();
+}
+
void WebInspectorClient::populateSetting(
const String& key, InspectorController::Setting&) {
NOTIMPLEMENTED();
diff --git a/webkit/glue/inspector_client_impl.h b/webkit/glue/inspector_client_impl.h
index 3f65140..92b1ead 100644
--- a/webkit/glue/inspector_client_impl.h
+++ b/webkit/glue/inspector_client_impl.h
@@ -20,6 +20,7 @@ public:
virtual WebCore::Page* createPage();
virtual WebCore::String localizedStringsURL();
+ virtual WebCore::String hiddenPanels();
virtual void showWindow();
virtual void closeWindow();
virtual bool windowVisible();