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

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

Issue 2505113002: Drag-and-drop: Target drag messages to specific RenderWidgets. (Closed)
Patch Set: Small fix. Created 4 years, 1 month 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
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 <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 int selected_item, 71 int selected_item,
72 const std::vector<MenuItem>& items, 72 const std::vector<MenuItem>& items,
73 bool right_aligned, 73 bool right_aligned,
74 bool allow_multiple_selection) override; 74 bool allow_multiple_selection) override;
75 void HidePopupMenu() override; 75 void HidePopupMenu() override;
76 #endif 76 #endif
77 void StartDragging(const DropData& drop_data, 77 void StartDragging(const DropData& drop_data,
78 WebDragOperationsMask operations_allowed, 78 WebDragOperationsMask operations_allowed,
79 const gfx::ImageSkia& image, 79 const gfx::ImageSkia& image,
80 const gfx::Vector2d& image_offset, 80 const gfx::Vector2d& image_offset,
81 const DragEventSourceInfo& event_info) override; 81 const DragEventSourceInfo& event_info,
82 RenderWidgetHostImpl* source_rwh) override;
82 void UpdateDragCursor(WebDragOperation operation) override; 83 void UpdateDragCursor(WebDragOperation operation) override;
83 void GotFocus() override; 84 void GotFocus() override;
84 void TakeFocus(bool reverse) override; 85 void TakeFocus(bool reverse) override;
85 virtual void OnFindReply(int request_id, 86 virtual void OnFindReply(int request_id,
86 int number_of_matches, 87 int number_of_matches,
87 const gfx::Rect& selection_rect, 88 const gfx::Rect& selection_rect,
88 int active_match_ordinal, 89 int active_match_ordinal,
89 bool final_update); 90 bool final_update);
90 91
91 private: 92 private:
(...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 void InterstitialPageImpl::InterstitialPageRVHDelegateView::HidePopupMenu() { 877 void InterstitialPageImpl::InterstitialPageRVHDelegateView::HidePopupMenu() {
877 NOTREACHED() << "InterstitialPage does not support showing popup menus."; 878 NOTREACHED() << "InterstitialPage does not support showing popup menus.";
878 } 879 }
879 #endif 880 #endif
880 881
881 void InterstitialPageImpl::InterstitialPageRVHDelegateView::StartDragging( 882 void InterstitialPageImpl::InterstitialPageRVHDelegateView::StartDragging(
882 const DropData& drop_data, 883 const DropData& drop_data,
883 WebDragOperationsMask allowed_operations, 884 WebDragOperationsMask allowed_operations,
884 const gfx::ImageSkia& image, 885 const gfx::ImageSkia& image,
885 const gfx::Vector2d& image_offset, 886 const gfx::Vector2d& image_offset,
886 const DragEventSourceInfo& event_info) { 887 const DragEventSourceInfo& event_info,
888 RenderWidgetHostImpl* source_rwh) {
887 interstitial_page_->render_view_host_->GetWidget()-> 889 interstitial_page_->render_view_host_->GetWidget()->
888 DragSourceSystemDragEnded(); 890 DragSourceSystemDragEnded();
889 DVLOG(1) << "InterstitialPage does not support dragging yet."; 891 DVLOG(1) << "InterstitialPage does not support dragging yet.";
890 } 892 }
891 893
892 void InterstitialPageImpl::InterstitialPageRVHDelegateView::UpdateDragCursor( 894 void InterstitialPageImpl::InterstitialPageRVHDelegateView::UpdateDragCursor(
893 WebDragOperation) { 895 WebDragOperation) {
894 NOTREACHED() << "InterstitialPage does not support dragging yet."; 896 NOTREACHED() << "InterstitialPage does not support dragging yet.";
895 } 897 }
896 898
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 void InterstitialPageImpl::UpdateDeviceScaleFactor(double device_scale_factor) { 953 void InterstitialPageImpl::UpdateDeviceScaleFactor(double device_scale_factor) {
952 WebContentsImpl* web_contents_impl = 954 WebContentsImpl* web_contents_impl =
953 static_cast<WebContentsImpl*>(web_contents_); 955 static_cast<WebContentsImpl*>(web_contents_);
954 if (!web_contents_impl) 956 if (!web_contents_impl)
955 return; 957 return;
956 958
957 web_contents_impl->UpdateDeviceScaleFactor(device_scale_factor); 959 web_contents_impl->UpdateDeviceScaleFactor(device_scale_factor);
958 } 960 }
959 961
960 } // namespace content 962 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698