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

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

Issue 18281002: Move WebDropData to content::DropData and split off conversion function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac build error. Created 7 years, 5 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/web_contents/interstitial_page_impl.h" 5 #include "content/browser/web_contents/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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 explicit InterstitialPageRVHDelegateView(InterstitialPageImpl* page); 73 explicit InterstitialPageRVHDelegateView(InterstitialPageImpl* page);
74 74
75 // RenderViewHostDelegateView implementation: 75 // RenderViewHostDelegateView implementation:
76 virtual void ShowPopupMenu(const gfx::Rect& bounds, 76 virtual void ShowPopupMenu(const gfx::Rect& bounds,
77 int item_height, 77 int item_height,
78 double item_font_size, 78 double item_font_size,
79 int selected_item, 79 int selected_item,
80 const std::vector<WebMenuItem>& items, 80 const std::vector<WebMenuItem>& items,
81 bool right_aligned, 81 bool right_aligned,
82 bool allow_multiple_selection) OVERRIDE; 82 bool allow_multiple_selection) OVERRIDE;
83 virtual void StartDragging(const WebDropData& drop_data, 83 virtual void StartDragging(const DropData& drop_data,
84 WebDragOperationsMask operations_allowed, 84 WebDragOperationsMask operations_allowed,
85 const gfx::ImageSkia& image, 85 const gfx::ImageSkia& image,
86 const gfx::Vector2d& image_offset, 86 const gfx::Vector2d& image_offset,
87 const DragEventSourceInfo& event_info) OVERRIDE; 87 const DragEventSourceInfo& event_info) OVERRIDE;
88 virtual void UpdateDragCursor(WebDragOperation operation) OVERRIDE; 88 virtual void UpdateDragCursor(WebDragOperation operation) OVERRIDE;
89 virtual void GotFocus() OVERRIDE; 89 virtual void GotFocus() OVERRIDE;
90 virtual void TakeFocus(bool reverse) OVERRIDE; 90 virtual void TakeFocus(bool reverse) OVERRIDE;
91 virtual void OnFindReply(int request_id, 91 virtual void OnFindReply(int request_id,
92 int number_of_matches, 92 int number_of_matches,
93 const gfx::Rect& selection_rect, 93 const gfx::Rect& selection_rect,
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 int item_height, 768 int item_height,
769 double item_font_size, 769 double item_font_size,
770 int selected_item, 770 int selected_item,
771 const std::vector<WebMenuItem>& items, 771 const std::vector<WebMenuItem>& items,
772 bool right_aligned, 772 bool right_aligned,
773 bool allow_multiple_selection) { 773 bool allow_multiple_selection) {
774 NOTREACHED() << "InterstitialPage does not support showing popup menus."; 774 NOTREACHED() << "InterstitialPage does not support showing popup menus.";
775 } 775 }
776 776
777 void InterstitialPageImpl::InterstitialPageRVHDelegateView::StartDragging( 777 void InterstitialPageImpl::InterstitialPageRVHDelegateView::StartDragging(
778 const WebDropData& drop_data, 778 const DropData& drop_data,
779 WebDragOperationsMask allowed_operations, 779 WebDragOperationsMask allowed_operations,
780 const gfx::ImageSkia& image, 780 const gfx::ImageSkia& image,
781 const gfx::Vector2d& image_offset, 781 const gfx::Vector2d& image_offset,
782 const DragEventSourceInfo& event_info) { 782 const DragEventSourceInfo& event_info) {
783 NOTREACHED() << "InterstitialPage does not support dragging yet."; 783 NOTREACHED() << "InterstitialPage does not support dragging yet.";
784 } 784 }
785 785
786 void InterstitialPageImpl::InterstitialPageRVHDelegateView::UpdateDragCursor( 786 void InterstitialPageImpl::InterstitialPageRVHDelegateView::UpdateDragCursor(
787 WebDragOperation) { 787 WebDragOperation) {
788 NOTREACHED() << "InterstitialPage does not support dragging yet."; 788 NOTREACHED() << "InterstitialPage does not support dragging yet.";
(...skipping 16 matching lines...) Expand all
805 805
806 web_contents->GetDelegateView()->TakeFocus(reverse); 806 web_contents->GetDelegateView()->TakeFocus(reverse);
807 } 807 }
808 808
809 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply( 809 void InterstitialPageImpl::InterstitialPageRVHDelegateView::OnFindReply(
810 int request_id, int number_of_matches, const gfx::Rect& selection_rect, 810 int request_id, int number_of_matches, const gfx::Rect& selection_rect,
811 int active_match_ordinal, bool final_update) { 811 int active_match_ordinal, bool final_update) {
812 } 812 }
813 813
814 } // namespace content 814 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/test_render_view_host.cc ('k') | content/browser/web_contents/web_contents_drag_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698