Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(823)

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 501583003: Move external popup menus from WebViewClient to WebFrameClient, part 3/3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixin Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/browser/frame_host/interstitial_page_impl.h" 5 #include "content/browser/frame_host/interstitial_page_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 } // namespace 72 } // namespace
73 73
74 class InterstitialPageImpl::InterstitialPageRVHDelegateView 74 class InterstitialPageImpl::InterstitialPageRVHDelegateView
75 : public RenderViewHostDelegateView { 75 : public RenderViewHostDelegateView {
76 public: 76 public:
77 explicit InterstitialPageRVHDelegateView(InterstitialPageImpl* page); 77 explicit InterstitialPageRVHDelegateView(InterstitialPageImpl* page);
78 78
79 // RenderViewHostDelegateView implementation: 79 // RenderViewHostDelegateView implementation:
80 #if defined(OS_MACOSX) || defined(OS_ANDROID) 80 #if defined(OS_MACOSX) || defined(OS_ANDROID)
81 virtual void ShowPopupMenu(const gfx::Rect& bounds, 81 virtual void ShowPopupMenu(RenderFrameHost* render_frame_host,
82 const gfx::Rect& bounds,
82 int item_height, 83 int item_height,
83 double item_font_size, 84 double item_font_size,
84 int selected_item, 85 int selected_item,
85 const std::vector<MenuItem>& items, 86 const std::vector<MenuItem>& items,
86 bool right_aligned, 87 bool right_aligned,
87 bool allow_multiple_selection) OVERRIDE; 88 bool allow_multiple_selection) OVERRIDE;
88 virtual void HidePopupMenu() OVERRIDE; 89 virtual void HidePopupMenu() OVERRIDE;
89 #endif 90 #endif
90 virtual void StartDragging(const DropData& drop_data, 91 virtual void StartDragging(const DropData& drop_data,
91 WebDragOperationsMask operations_allowed, 92 WebDragOperationsMask operations_allowed,
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 } 857 }
857 858
858 859
859 InterstitialPageImpl::InterstitialPageRVHDelegateView:: 860 InterstitialPageImpl::InterstitialPageRVHDelegateView::
860 InterstitialPageRVHDelegateView(InterstitialPageImpl* page) 861 InterstitialPageRVHDelegateView(InterstitialPageImpl* page)
861 : interstitial_page_(page) { 862 : interstitial_page_(page) {
862 } 863 }
863 864
864 #if defined(OS_MACOSX) || defined(OS_ANDROID) 865 #if defined(OS_MACOSX) || defined(OS_ANDROID)
865 void InterstitialPageImpl::InterstitialPageRVHDelegateView::ShowPopupMenu( 866 void InterstitialPageImpl::InterstitialPageRVHDelegateView::ShowPopupMenu(
867 RenderFrameHost* render_frame_host,
866 const gfx::Rect& bounds, 868 const gfx::Rect& bounds,
867 int item_height, 869 int item_height,
868 double item_font_size, 870 double item_font_size,
869 int selected_item, 871 int selected_item,
870 const std::vector<MenuItem>& items, 872 const std::vector<MenuItem>& items,
871 bool right_aligned, 873 bool right_aligned,
872 bool allow_multiple_selection) { 874 bool allow_multiple_selection) {
873 NOTREACHED() << "InterstitialPage does not support showing popup menus."; 875 NOTREACHED() << "InterstitialPage does not support showing popup menus.";
874 } 876 }
875 877
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 912
911 web_contents->GetDelegateView()->TakeFocus(reverse); 913 web_contents->GetDelegateView()->TakeFocus(reverse);
912 } 914 }
913 915
914 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 916 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
915 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 917 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
916 int active_match_ordinal, bool final_update) { 918 int active_match_ordinal, bool final_update) {
917 } 919 }
918 920
919 } // namespace content 921 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698