| OLD | NEW |
| 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/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1158 int item_height, | 1158 int item_height, |
| 1159 double item_font_size, | 1159 double item_font_size, |
| 1160 int selected_item, | 1160 int selected_item, |
| 1161 const std::vector<MenuItem>& items, | 1161 const std::vector<MenuItem>& items, |
| 1162 bool right_aligned, | 1162 bool right_aligned, |
| 1163 bool allow_multiple_selection) { | 1163 bool allow_multiple_selection) { |
| 1164 // External popup menus are only used on Mac and Android. | 1164 // External popup menus are only used on Mac and Android. |
| 1165 NOTIMPLEMENTED(); | 1165 NOTIMPLEMENTED(); |
| 1166 } | 1166 } |
| 1167 | 1167 |
| 1168 void WebContentsViewAura::HidePopupMenu() { |
| 1169 // External popup menus are only used on Mac and Android. |
| 1170 NOTIMPLEMENTED(); |
| 1171 } |
| 1172 |
| 1168 void WebContentsViewAura::StartDragging( | 1173 void WebContentsViewAura::StartDragging( |
| 1169 const DropData& drop_data, | 1174 const DropData& drop_data, |
| 1170 blink::WebDragOperationsMask operations, | 1175 blink::WebDragOperationsMask operations, |
| 1171 const gfx::ImageSkia& image, | 1176 const gfx::ImageSkia& image, |
| 1172 const gfx::Vector2d& image_offset, | 1177 const gfx::Vector2d& image_offset, |
| 1173 const DragEventSourceInfo& event_info) { | 1178 const DragEventSourceInfo& event_info) { |
| 1174 aura::Window* root_window = GetNativeView()->GetRootWindow(); | 1179 aura::Window* root_window = GetNativeView()->GetRootWindow(); |
| 1175 if (!aura::client::GetDragDropClient(root_window)) { | 1180 if (!aura::client::GetDragDropClient(root_window)) { |
| 1176 web_contents_->SystemDragEnded(); | 1181 web_contents_->SystemDragEnded(); |
| 1177 return; | 1182 return; |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1535 event.location(), | 1540 event.location(), |
| 1536 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), | 1541 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), |
| 1537 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); | 1542 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); |
| 1538 if (drag_dest_delegate_) | 1543 if (drag_dest_delegate_) |
| 1539 drag_dest_delegate_->OnDrop(); | 1544 drag_dest_delegate_->OnDrop(); |
| 1540 current_drop_data_.reset(); | 1545 current_drop_data_.reset(); |
| 1541 return ConvertFromWeb(current_drag_op_); | 1546 return ConvertFromWeb(current_drag_op_); |
| 1542 } | 1547 } |
| 1543 | 1548 |
| 1544 } // namespace content | 1549 } // namespace content |
| OLD | NEW |