summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authordglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-29 20:49:29 +0000
committerdglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-29 20:49:29 +0000
commitf3d3105812b7591b07b7ae5ef2273c21e8ae180a (patch)
tree96ab36e4ca757f9fa02772d842a5b11b8464a9bc /webkit/glue
parent4a88eea2fbcbf48d550cf4594f9efe5114c8b527 (diff)
downloadchromium_src-f3d3105812b7591b07b7ae5ef2273c21e8ae180a.zip
chromium_src-f3d3105812b7591b07b7ae5ef2273c21e8ae180a.tar.gz
chromium_src-f3d3105812b7591b07b7ae5ef2273c21e8ae180a.tar.bz2
Fixes for upcoming WebKit update.
* Added ENABLE_DATAGRID define temporarily (we will remove it once the V8Proxy stuff lands) * Added new ContextMenuClient::isSpeaking method, which will be needed for http://trac.webkit.org/changeset/45333 R=darin TEST=no regressions in layout tests. BUG=none Review URL: http://codereview.chromium.org/151035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/context_menu_client_impl.cc4
-rw-r--r--webkit/glue/context_menu_client_impl.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/webkit/glue/context_menu_client_impl.cc b/webkit/glue/context_menu_client_impl.cc
index 26bb558..35c9b30 100644
--- a/webkit/glue/context_menu_client_impl.cc
+++ b/webkit/glue/context_menu_client_impl.cc
@@ -277,6 +277,10 @@ void ContextMenuClientImpl::lookUpInDictionary(WebCore::Frame*) {
void ContextMenuClientImpl::speak(const WebCore::String&) {
}
+bool ContextMenuClientImpl::isSpeaking() {
+ return false;
+}
+
void ContextMenuClientImpl::stopSpeaking() {
}
diff --git a/webkit/glue/context_menu_client_impl.h b/webkit/glue/context_menu_client_impl.h
index 8d3eeb9..176196e 100644
--- a/webkit/glue/context_menu_client_impl.h
+++ b/webkit/glue/context_menu_client_impl.h
@@ -34,6 +34,7 @@ public:
virtual void searchWithGoogle(const WebCore::Frame*);
virtual void lookUpInDictionary(WebCore::Frame*);
virtual void speak(const WebCore::String&);
+ virtual bool isSpeaking();
virtual void stopSpeaking();
virtual bool shouldIncludeInspectElementItem();