summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-14 05:01:06 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-14 05:01:06 +0000
commitb5ef2ca48635ddf96698a11676a4625aff6ef734 (patch)
treeae2ff1c2827771f3afe4e420afa79eddff76993c /webkit
parent374aed07d0cc411bd372919ffbde08dc59b251a9 (diff)
downloadchromium_src-b5ef2ca48635ddf96698a11676a4625aff6ef734.zip
chromium_src-b5ef2ca48635ddf96698a11676a4625aff6ef734.tar.gz
chromium_src-b5ef2ca48635ddf96698a11676a4625aff6ef734.tar.bz2
Update overridden function signature for the test to bring it in sync with my
last change to context menu encodings. Review URL: http://codereview.chromium.org/2831 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2190 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc3
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index c944a09..a012431 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -486,8 +486,7 @@ void TestWebViewDelegate::ShowContextMenu(WebView* webview,
const GURL& frame_url,
const std::wstring& selection_text,
const std::wstring& misspelled_word,
- int edit_flags,
- const std::wstring& frame_encoding) {
+ int edit_flags) {
CapturedContextMenuEvent context(type, x, y);
captured_context_menu_events_.push_back(context);
}
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index d8277a4..02b1422 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -100,8 +100,7 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
const GURL& frame_url,
const std::wstring& selection_text,
const std::wstring& misspelled_word,
- int edit_flags,
- const std::wstring& frame_encoding);
+ int edit_flags);
virtual void DidStartProvisionalLoadForFrame(
WebView* webview,
WebFrame* frame,