Commit f10cba2e authored by Pedro Amaral's avatar Pedro Amaral Committed by Commit Bot

Revert "Interstitial call ShowContextMenu on Android"

This reverts commit a17de6fe.

Reason for revert: The options in the selection menu don't work. Copy and Select All don't do anything.

Original change's description:
> Interstitial call ShowContextMenu on Android
> 
> Override |ShowContextMenu()| in InterstitialPageImpl and have it call
> |WebContentsViewAndroid.ShowContextMenu()| on Android. This is done to
> show the floating text selection menu (see linked bug).
> 
> Bug: 823173
> Change-Id: I01090aee43536cd06c8f8bc28ebccf5c2767d0d8
> Reviewed-on: https://chromium-review.googlesource.com/977240
> Reviewed-by: Bo <boliu@chromium.org>
> Reviewed-by: Carlos IL <carlosil@chromium.org>
> Commit-Queue: Pedro Amaral <amaralp@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#546210}

TBR=boliu@chromium.org,amaralp@chromium.org,carlosil@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 823173
Change-Id: Ia0743769b372b93acda2835c2274456f3a5379a0
Reviewed-on: https://chromium-review.googlesource.com/994191Reviewed-by: default avatarPedro Amaral <amaralp@chromium.org>
Reviewed-by: default avatarCarlos IL <carlosil@chromium.org>
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547953}
parent 6b7fb559
...@@ -58,10 +58,6 @@ ...@@ -58,10 +58,6 @@
#include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context_getter.h"
#include "ui/base/page_transition_types.h" #include "ui/base/page_transition_types.h"
#if defined(OS_ANDROID)
#include "content/browser/web_contents/web_contents_view_android.h"
#endif
using blink::WebDragOperation; using blink::WebDragOperation;
using blink::WebDragOperationsMask; using blink::WebDragOperationsMask;
...@@ -798,15 +794,6 @@ void InterstitialPageImpl::CreateNewFullscreenWidget(int32_t render_process_id, ...@@ -798,15 +794,6 @@ void InterstitialPageImpl::CreateNewFullscreenWidget(int32_t render_process_id,
<< "InterstitialPage does not support showing full screen popups."; << "InterstitialPage does not support showing full screen popups.";
} }
void InterstitialPageImpl::ShowContextMenu(RenderFrameHost* render_frame_host,
const ContextMenuParams& params) {
#if defined(OS_ANDROID)
static_cast<WebContentsViewAndroid*>(
static_cast<WebContentsImpl*>(web_contents())->GetView())
->ShowContextMenu(render_frame_host, params);
#endif
}
void InterstitialPageImpl::ShowCreatedWindow(int process_id, void InterstitialPageImpl::ShowCreatedWindow(int process_id,
int main_frame_widget_route_id, int main_frame_widget_route_id,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
......
...@@ -107,8 +107,6 @@ class CONTENT_EXPORT InterstitialPageImpl : public InterstitialPage, ...@@ -107,8 +107,6 @@ class CONTENT_EXPORT InterstitialPageImpl : public InterstitialPage,
const NotificationDetails& details) override; const NotificationDetails& details) override;
// RenderFrameHostDelegate implementation: // RenderFrameHostDelegate implementation:
void ShowContextMenu(RenderFrameHost* render_frame_host,
const ContextMenuParams& params) override;
bool OnMessageReceived(RenderFrameHostImpl* render_frame_host, bool OnMessageReceived(RenderFrameHostImpl* render_frame_host,
const IPC::Message& message) override; const IPC::Message& message) override;
void RenderFrameCreated(RenderFrameHost* render_frame_host) override; void RenderFrameCreated(RenderFrameHost* render_frame_host) override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment