Index: chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc |
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc |
index 0ff74e976e37d7029abfbf3aa9048b922c2740bc..9d7e9fdcc4b1c88ac79702b0cc67a81128ce7ff0 100644 |
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc |
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc |
@@ -24,10 +24,6 @@ |
#include "ui/views/focus/view_storage.h" |
#include "ui/views/widget/widget.h" |
-#if defined(USE_AURA) |
-#include "chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.h" |
-#endif |
- |
ChromeWebContentsViewDelegateViews::ChromeWebContentsViewDelegateViews( |
content::WebContents* web_contents) |
: ContextMenuDelegate(web_contents), |
@@ -153,36 +149,6 @@ void ChromeWebContentsViewDelegateViews::ShowContextMenu( |
params)); |
} |
-void ChromeWebContentsViewDelegateViews::ShowDisambiguationPopup( |
- const gfx::Rect& target_rect, |
- const SkBitmap& zoomed_bitmap, |
- const gfx::NativeView content, |
- const base::Callback<void(ui::GestureEvent*)>& gesture_cb, |
- const base::Callback<void(ui::MouseEvent*)>& mouse_cb) { |
-#if defined(USE_AURA) |
- // If we are attempting to show a link disambiguation popup while already |
- // showing one this means that the popup itself received an ambiguous touch. |
- // Don't show another popup in this case. |
- if (link_disambiguation_popup_) { |
- link_disambiguation_popup_.reset(); |
- return; |
- } |
- |
- link_disambiguation_popup_.reset(new LinkDisambiguationPopup); |
- link_disambiguation_popup_->Show( |
- views::Widget::GetTopLevelWidgetForNativeView(GetActiveNativeView()), |
- zoomed_bitmap, |
- target_rect, |
- content, |
- gesture_cb, |
- mouse_cb); |
-#endif |
-} |
- |
-void ChromeWebContentsViewDelegateViews::HideDisambiguationPopup() { |
- link_disambiguation_popup_.reset(); |
-} |
- |
void ChromeWebContentsViewDelegateViews::SizeChanged(const gfx::Size& size) { |
SadTabHelper* sad_tab_helper = SadTabHelper::FromWebContents(web_contents_); |
if (!sad_tab_helper) |