| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "athena/content/public/web_contents_view_delegate_creator.h" | 5 #include "athena/content/public/web_contents_view_delegate_creator.h" |
| 6 | 6 |
| 7 #include "athena/content/render_view_context_menu_impl.h" | 7 #include "athena/content/render_view_context_menu_impl.h" |
| 8 #include "components/web_modal/popup_manager.h" | 8 #include "components/web_modal/popup_manager.h" |
| 9 #include "components/web_modal/single_web_contents_dialog_manager.h" | 9 #include "components/web_modal/single_web_contents_dialog_manager.h" |
| 10 #include "components/web_modal/web_contents_modal_dialog_host.h" | 10 #include "components/web_modal/web_contents_modal_dialog_host.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 const content::ContextMenuParams& params) OVERRIDE { | 44 const content::ContextMenuParams& params) OVERRIDE { |
| 45 ShowMenu(BuildMenu( | 45 ShowMenu(BuildMenu( |
| 46 content::WebContents::FromRenderFrameHost(render_frame_host), params)); | 46 content::WebContents::FromRenderFrameHost(render_frame_host), params)); |
| 47 } | 47 } |
| 48 | 48 |
| 49 virtual void SizeChanged(const gfx::Size& size) OVERRIDE { | 49 virtual void SizeChanged(const gfx::Size& size) OVERRIDE { |
| 50 // TODO(oshima|sadrul): Implement this when sad_tab is componentized. | 50 // TODO(oshima|sadrul): Implement this when sad_tab is componentized. |
| 51 // See c/b/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc | 51 // See c/b/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc |
| 52 } | 52 } |
| 53 | 53 |
| 54 virtual void ShowDisambiguationPopup( |
| 55 const gfx::Rect& target_rect, |
| 56 const SkBitmap& zoomed_bitmap, |
| 57 const gfx::NativeView content, |
| 58 const base::Callback<void(ui::GestureEvent*)>& gesture_cb, |
| 59 const base::Callback<void(ui::MouseEvent*)>& mouse_cb) OVERRIDE { |
| 60 } |
| 61 |
| 62 virtual void HideDisambiguationPopup() OVERRIDE { |
| 63 } |
| 64 |
| 54 scoped_ptr<RenderViewContextMenuImpl> BuildMenu( | 65 scoped_ptr<RenderViewContextMenuImpl> BuildMenu( |
| 55 content::WebContents* web_contents, | 66 content::WebContents* web_contents, |
| 56 const content::ContextMenuParams& params) { | 67 const content::ContextMenuParams& params) { |
| 57 scoped_ptr<RenderViewContextMenuImpl> menu; | 68 scoped_ptr<RenderViewContextMenuImpl> menu; |
| 58 content::RenderFrameHost* focused_frame = web_contents->GetFocusedFrame(); | 69 content::RenderFrameHost* focused_frame = web_contents->GetFocusedFrame(); |
| 59 // If the frame tree does not have a focused frame at this point, do not | 70 // If the frame tree does not have a focused frame at this point, do not |
| 60 // bother creating RenderViewContextMenuViews. | 71 // bother creating RenderViewContextMenuViews. |
| 61 // This happens if the frame has navigated to a different page before | 72 // This happens if the frame has navigated to a different page before |
| 62 // ContextMenu message was received by the current RenderFrameHost. | 73 // ContextMenu message was received by the current RenderFrameHost. |
| 63 if (focused_frame) { | 74 if (focused_frame) { |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 }; | 144 }; |
| 134 | 145 |
| 135 } // namespace | 146 } // namespace |
| 136 | 147 |
| 137 content::WebContentsViewDelegate* CreateWebContentsViewDelegate( | 148 content::WebContentsViewDelegate* CreateWebContentsViewDelegate( |
| 138 content::WebContents* web_contents) { | 149 content::WebContents* web_contents) { |
| 139 return new WebContentsViewDelegateImpl(web_contents); | 150 return new WebContentsViewDelegateImpl(web_contents); |
| 140 } | 151 } |
| 141 | 152 |
| 142 } // namespace athena | 153 } // namespace athena |
| OLD | NEW |