summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-07 20:47:13 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-07 20:47:13 +0000
commit38b62835d5e389f17b1071377eabd531085c5a1a (patch)
tree789b9fb91a947d6c49850b6e2370ee1981015c1c /webkit/glue
parent5530f662a27674b5f705dbaaf809ca685c31a226 (diff)
downloadchromium_src-38b62835d5e389f17b1071377eabd531085c5a1a.zip
chromium_src-38b62835d5e389f17b1071377eabd531085c5a1a.tar.gz
chromium_src-38b62835d5e389f17b1071377eabd531085c5a1a.tar.bz2
Merge in InspectorController changes. Get rid of all the
crazy ifdef'ing in port/.../InspectorController.cpp. Change jsc build back to useing the InspectorController in third_party/WebKit. Review URL: http://codereview.chromium.org/6519 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webview_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index c667e06..85ef80d 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -1225,7 +1225,7 @@ void WebViewImpl::InspectElement(int x, int y) {
}
void WebViewImpl::ShowJavaScriptConsole() {
- page_->inspectorController()->showConsole();
+ page_->inspectorController()->showPanel(InspectorController::ConsolePanel);
}
void WebViewImpl::DragSourceEndedAt(