| 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 #import <Carbon/Carbon.h> | 5 #import <Carbon/Carbon.h> |
| 6 | 6 |
| 7 #import "content/browser/web_contents/web_contents_view_mac.h" | 7 #import "content/browser/web_contents/web_contents_view_mac.h" |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 } | 241 } |
| 242 | 242 |
| 243 bool WebContentsViewMac::IsDoingDrag() const { | 243 bool WebContentsViewMac::IsDoingDrag() const { |
| 244 return false; | 244 return false; |
| 245 } | 245 } |
| 246 | 246 |
| 247 void WebContentsViewMac::CancelDragAndCloseTab() { | 247 void WebContentsViewMac::CancelDragAndCloseTab() { |
| 248 } | 248 } |
| 249 | 249 |
| 250 WebDropData* WebContentsViewMac::GetDropData() const { | 250 WebDropData* WebContentsViewMac::GetDropData() const { |
| 251 return NULL; | 251 return [dragDest_ currentDropData]; |
| 252 } | 252 } |
| 253 | 253 |
| 254 void WebContentsViewMac::UpdateDragCursor(WebDragOperation operation) { | 254 void WebContentsViewMac::UpdateDragCursor(WebDragOperation operation) { |
| 255 [cocoa_view_ setCurrentDragOperation: operation]; | 255 [cocoa_view_ setCurrentDragOperation: operation]; |
| 256 } | 256 } |
| 257 | 257 |
| 258 void WebContentsViewMac::GotFocus() { | 258 void WebContentsViewMac::GotFocus() { |
| 259 // This is only used in the views FocusManager stuff but it bleeds through | 259 // This is only used in the views FocusManager stuff but it bleeds through |
| 260 // all subclasses. http://crbug.com/21875 | 260 // all subclasses. http://crbug.com/21875 |
| 261 } | 261 } |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 574 [[[notification userInfo] objectForKey:kSelectionDirection] | 574 [[[notification userInfo] objectForKey:kSelectionDirection] |
| 575 unsignedIntegerValue]; | 575 unsignedIntegerValue]; |
| 576 if (direction == NSDirectSelection) | 576 if (direction == NSDirectSelection) |
| 577 return; | 577 return; |
| 578 | 578 |
| 579 [self webContents]-> | 579 [self webContents]-> |
| 580 FocusThroughTabTraversal(direction == NSSelectingPrevious); | 580 FocusThroughTabTraversal(direction == NSSelectingPrevious); |
| 581 } | 581 } |
| 582 | 582 |
| 583 @end | 583 @end |
| OLD | NEW |