summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_view_impl.cc
diff options
context:
space:
mode:
authortkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 15:42:40 +0000
committertkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 15:42:40 +0000
commit539078606e5dc22fd5c48aad50536a7c6c0f9bf2 (patch)
tree785eec179a3d8b651cbd294f38a1885435042402 /content/renderer/render_view_impl.cc
parentd460114dfb3c91dab0218cacca889b93212d5a2e (diff)
downloadchromium_src-539078606e5dc22fd5c48aad50536a7c6c0f9bf2.zip
chromium_src-539078606e5dc22fd5c48aad50536a7c6c0f9bf2.tar.gz
chromium_src-539078606e5dc22fd5c48aad50536a7c6c0f9bf2.tar.bz2
Enable ExternalPopupMenu-related code only on Mac and Android.
- Build external_popup_menu.{cc,h} only on Mac and Android. - RenderViewImpl and RenderWidget should have external_popup_menu_-related code only on Mac and Android. - Define ViewHostMsg_ShowPopup and ViewHostMsg_HidePopup only on Mac and Android. - Add default implementations to WebContentsViewDelegateView:: ShowPopupMenu and HidePopupMenu to simplify the code. R=tsepez@chromium.org, avi@chromium.org BUG= Review URL: https://codereview.chromium.org/209723003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_impl.cc')
-rw-r--r--content/renderer/render_view_impl.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 121b28a..c233ad9 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1632,6 +1632,7 @@ WebWidget* RenderViewImpl::createPopupMenu(blink::WebPopupType popup_type) {
WebExternalPopupMenu* RenderViewImpl::createExternalPopupMenu(
const WebPopupMenuInfo& popup_menu_info,
WebExternalPopupMenuClient* popup_menu_client) {
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
// An IPC message is sent to the browser to build and display the actual
// popup. The user could have time to click a different select by the time
// the popup is shown. In that case external_popup_menu_ is non NULL.
@@ -1647,6 +1648,9 @@ WebExternalPopupMenu* RenderViewImpl::createExternalPopupMenu(
external_popup_menu_.get(), screen_metrics_emulator_.get());
}
return external_popup_menu_.get();
+#else
+ return NULL;
+#endif
}
WebStorageNamespace* RenderViewImpl::createSessionStorageNamespace() {
@@ -4759,11 +4763,13 @@ void RenderViewImpl::OnSelectPopupMenuItems(
}
#endif
+#if defined(OS_MACOSX) || defined(OS_ANDROID)
void RenderViewImpl::DidHideExternalPopupMenu() {
// We need to clear external_popup_menu_ as soon as ExternalPopupMenu::close
// is called. Otherwise, createExternalPopupMenu() for new popup will fail.
external_popup_menu_.reset();
}
+#endif
void RenderViewImpl::OnShowContextMenu(const gfx::Point& location) {
context_menu_source_type_ = ui::MENU_SOURCE_TOUCH_EDIT_MENU;