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

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

Issue 197533008: Mac: ExternalPopupMenu::close should hide a showing popup menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test fix Created 6 years, 9 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
« no previous file with comments | « no previous file | content/browser/renderer_host/popup_menu_helper_mac.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 explicit InterstitialPageRVHDelegateView(InterstitialPageImpl* page); 77 explicit InterstitialPageRVHDelegateView(InterstitialPageImpl* page);
78 78
79 // RenderViewHostDelegateView implementation: 79 // RenderViewHostDelegateView implementation:
80 virtual void ShowPopupMenu(const gfx::Rect& bounds, 80 virtual void ShowPopupMenu(const gfx::Rect& bounds,
81 int item_height, 81 int item_height,
82 double item_font_size, 82 double item_font_size,
83 int selected_item, 83 int selected_item,
84 const std::vector<MenuItem>& items, 84 const std::vector<MenuItem>& items,
85 bool right_aligned, 85 bool right_aligned,
86 bool allow_multiple_selection) OVERRIDE; 86 bool allow_multiple_selection) OVERRIDE;
87 virtual void HidePopupMenu() OVERRIDE;
87 virtual void StartDragging(const DropData& drop_data, 88 virtual void StartDragging(const DropData& drop_data,
88 WebDragOperationsMask operations_allowed, 89 WebDragOperationsMask operations_allowed,
89 const gfx::ImageSkia& image, 90 const gfx::ImageSkia& image,
90 const gfx::Vector2d& image_offset, 91 const gfx::Vector2d& image_offset,
91 const DragEventSourceInfo& event_info) OVERRIDE; 92 const DragEventSourceInfo& event_info) OVERRIDE;
92 virtual void UpdateDragCursor(WebDragOperation operation) OVERRIDE; 93 virtual void UpdateDragCursor(WebDragOperation operation) OVERRIDE;
93 virtual void GotFocus() OVERRIDE; 94 virtual void GotFocus() OVERRIDE;
94 virtual void TakeFocus(bool reverse) OVERRIDE; 95 virtual void TakeFocus(bool reverse) OVERRIDE;
95 virtual void OnFindReply(int request_id, 96 virtual void OnFindReply(int request_id,
96 int number_of_matches, 97 int number_of_matches,
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 const gfx::Rect& bounds, 851 const gfx::Rect& bounds,
851 int item_height, 852 int item_height,
852 double item_font_size, 853 double item_font_size,
853 int selected_item, 854 int selected_item,
854 const std::vector<MenuItem>& items, 855 const std::vector<MenuItem>& items,
855 bool right_aligned, 856 bool right_aligned,
856 bool allow_multiple_selection) { 857 bool allow_multiple_selection) {
857 NOTREACHED() << "InterstitialPage does not support showing popup menus."; 858 NOTREACHED() << "InterstitialPage does not support showing popup menus.";
858 } 859 }
859 860
861 void InterstitialPageImpl::InterstitialPageRVHDelegateView::HidePopupMenu() {
862 NOTREACHED() << "InterstitialPage does not support showing popup menus.";
863 }
864
860 void InterstitialPageImpl::InterstitialPageRVHDelegateView::StartDragging( 865 void InterstitialPageImpl::InterstitialPageRVHDelegateView::StartDragging(
861 const DropData& drop_data, 866 const DropData& drop_data,
862 WebDragOperationsMask allowed_operations, 867 WebDragOperationsMask allowed_operations,
863 const gfx::ImageSkia& image, 868 const gfx::ImageSkia& image,
864 const gfx::Vector2d& image_offset, 869 const gfx::Vector2d& image_offset,
865 const DragEventSourceInfo& event_info) { 870 const DragEventSourceInfo& event_info) {
866 NOTREACHED() << "InterstitialPage does not support dragging yet."; 871 NOTREACHED() << "InterstitialPage does not support dragging yet.";
867 } 872 }
868 873
869 void InterstitialPageImpl::InterstitialPageRVHDelegateView::UpdateDragCursor( 874 void InterstitialPageImpl::InterstitialPageRVHDelegateView::UpdateDragCursor(
(...skipping 18 matching lines...) Expand all
888 893
889 web_contents->GetDelegateView()->TakeFocus(reverse); 894 web_contents->GetDelegateView()->TakeFocus(reverse);
890 } 895 }
891 896
892 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 897 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
893 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 898 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
894 int active_match_ordinal, bool final_update) { 899 int active_match_ordinal, bool final_update) {
895 } 900 }
896 901
897 } // namespace content 902 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/popup_menu_helper_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698