Chromium Code Reviews| 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 b8ccbd8fbbaff98432cb699efaba80a3df5a7d9d..375d68aa539cd5cc2c4f5828aba59504c09a046c 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 |
| @@ -21,6 +21,10 @@ |
| #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), |
| @@ -166,6 +170,22 @@ void ChromeWebContentsViewDelegateViews::ShowContextMenu( |
| params)); |
| } |
| +void ChromeWebContentsViewDelegateViews::ShowDisambiguationPopup( |
| + const gfx::Rect& target_rect, |
| + const SkBitmap& zoomed_bitmap, |
| + const gfx::NativeView content, |
| + const content::WebContentsViewDelegate::GestureCallback& callback) { |
| +#if defined(USE_AURA) |
|
sky
2014/09/11 14:53:43
Last I remember chromeos didn't want this. Did tha
luken
2014/09/17 00:00:48
Done.
|
| + link_disambiguation_popup_.reset(new LinkDisambiguationPopup); |
| + link_disambiguation_popup_->Show( |
| + zoomed_bitmap, target_rect, content, callback); |
| +#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) |