summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-12 20:42:51 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-12 20:42:51 +0000
commit35be7ecb614853d450ea138e2c97cae9633a40a8 (patch)
tree4ac9b3433b0ab401b8fdff8f32bd5f973fd140f7 /webkit/tools
parentc9ec57f7bcc1fb9f8fddfc89e2746b0206691711 (diff)
downloadchromium_src-35be7ecb614853d450ea138e2c97cae9633a40a8.zip
chromium_src-35be7ecb614853d450ea138e2c97cae9633a40a8.tar.gz
chromium_src-35be7ecb614853d450ea138e2c97cae9633a40a8.tar.bz2
Move ContextMenuParams struct from webkit/glue to content/public/common. The reasons are:
-this struct wasn't used at all in webkit layer, so no need to have it there -we can avoid exposing content layer's serialization of SSLInfo to embedders -avoid mentioning routing_ids in the webkit layer BUG=98716 Review URL: https://chromiumcodereview.appspot.com/9382037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121673 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/test_shell.gypi1
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc13
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h9
3 files changed, 0 insertions, 23 deletions
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 787b403..6f49b9b 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -429,7 +429,6 @@
'../../fileapi/test_file_set.h',
'../../fileapi/webfilewriter_base_unittest.cc',
'../../glue/bookmarklet_unittest.cc',
- '../../glue/context_menu_unittest.cc',
'../../glue/cpp_bound_class_unittest.cc',
'../../glue/cpp_variant_unittest.cc',
'../../glue/dom_operations_unittest.cc',
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 36040cf..01c2b68 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -495,19 +495,6 @@ bool TestWebViewDelegate::runModalBeforeUnloadDialog(
return true; // Allow window closure.
}
-void TestWebViewDelegate::showContextMenu(
- WebFrame* frame, const WebContextMenuData& data) {
- CapturedContextMenuEvent context(data.mediaType,
- data.mousePosition.x,
- data.mousePosition.y);
- captured_context_menu_events_.push_back(context);
- last_context_menu_data_.reset(new WebContextMenuData(data));
-}
-
-void TestWebViewDelegate::ClearContextMenuData() {
- last_context_menu_data_.reset();
-}
-
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 7bd34df..793f3c0 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -131,8 +131,6 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
const WebKit::WebString& default_value, WebKit::WebString* actual_value);
virtual bool runModalBeforeUnloadDialog(
WebKit::WebFrame* frame, const WebKit::WebString& message);
- virtual void showContextMenu(
- WebKit::WebFrame* frame, const WebKit::WebContextMenuData& data);
virtual void setStatusText(const WebKit::WebString& text);
virtual void startDragging(
const WebKit::WebDragData& data, WebKit::WebDragOperationsMask mask,
@@ -265,12 +263,6 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
#if defined(OS_WIN)
IDropTarget* drop_delegate() { return drop_delegate_.get(); }
#endif
- const CapturedContextMenuEvents& captured_context_menu_events() const {
- return captured_context_menu_events_;
- }
- void clear_captured_context_menu_events() {
- captured_context_menu_events_.clear();
- }
void set_pending_extra_data(TestShellExtraData* extra_data) {
pending_extra_data_.reset(extra_data);
@@ -403,7 +395,6 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
ResourceMap resource_identifier_map_;
std::string GetResourceDescription(uint32 identifier);
- CapturedContextMenuEvents captured_context_menu_events_;
scoped_ptr<WebKit::WebContextMenuData> last_context_menu_data_;
WebCursor current_cursor_;