| 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 10 matching lines...) Expand all Loading... |
| 21 #include "content/common/view_messages.h" | 21 #include "content/common/view_messages.h" |
| 22 #include "content/public/browser/web_contents_delegate.h" | 22 #include "content/public/browser/web_contents_delegate.h" |
| 23 #include "content/public/browser/web_contents_view_delegate.h" | 23 #include "content/public/browser/web_contents_view_delegate.h" |
| 24 #include "skia/ext/skia_utils_mac.h" | 24 #include "skia/ext/skia_utils_mac.h" |
| 25 #import "third_party/mozilla/NSPasteboard+Utils.h" | 25 #import "third_party/mozilla/NSPasteboard+Utils.h" |
| 26 #include "ui/base/clipboard/custom_data_helper.h" | 26 #include "ui/base/clipboard/custom_data_helper.h" |
| 27 #import "ui/base/cocoa/focus_tracker.h" | 27 #import "ui/base/cocoa/focus_tracker.h" |
| 28 #include "ui/base/dragdrop/cocoa_dnd_util.h" | 28 #include "ui/base/dragdrop/cocoa_dnd_util.h" |
| 29 #include "ui/gfx/image/image_skia_util_mac.h" | 29 #include "ui/gfx/image/image_skia_util_mac.h" |
| 30 | 30 |
| 31 using WebKit::WebDragOperation; | 31 using blink::WebDragOperation; |
| 32 using WebKit::WebDragOperationsMask; | 32 using blink::WebDragOperationsMask; |
| 33 using content::DropData; | 33 using content::DropData; |
| 34 using content::PopupMenuHelper; | 34 using content::PopupMenuHelper; |
| 35 using content::RenderViewHostFactory; | 35 using content::RenderViewHostFactory; |
| 36 using content::RenderWidgetHostView; | 36 using content::RenderWidgetHostView; |
| 37 using content::RenderWidgetHostViewMac; | 37 using content::RenderWidgetHostViewMac; |
| 38 using content::WebContents; | 38 using content::WebContents; |
| 39 using content::WebContentsImpl; | 39 using content::WebContentsImpl; |
| 40 using content::WebContentsViewMac; | 40 using content::WebContentsViewMac; |
| 41 | 41 |
| 42 // Ensure that the WebKit::WebDragOperation enum values stay in sync with | 42 // Ensure that the blink::WebDragOperation enum values stay in sync with |
| 43 // NSDragOperation constants, since the code below static_casts between 'em. | 43 // NSDragOperation constants, since the code below static_casts between 'em. |
| 44 #define COMPILE_ASSERT_MATCHING_ENUM(name) \ | 44 #define COMPILE_ASSERT_MATCHING_ENUM(name) \ |
| 45 COMPILE_ASSERT(int(NS##name) == int(WebKit::Web##name), enum_mismatch_##name) | 45 COMPILE_ASSERT(int(NS##name) == int(blink::Web##name), enum_mismatch_##name) |
| 46 COMPILE_ASSERT_MATCHING_ENUM(DragOperationNone); | 46 COMPILE_ASSERT_MATCHING_ENUM(DragOperationNone); |
| 47 COMPILE_ASSERT_MATCHING_ENUM(DragOperationCopy); | 47 COMPILE_ASSERT_MATCHING_ENUM(DragOperationCopy); |
| 48 COMPILE_ASSERT_MATCHING_ENUM(DragOperationLink); | 48 COMPILE_ASSERT_MATCHING_ENUM(DragOperationLink); |
| 49 COMPILE_ASSERT_MATCHING_ENUM(DragOperationGeneric); | 49 COMPILE_ASSERT_MATCHING_ENUM(DragOperationGeneric); |
| 50 COMPILE_ASSERT_MATCHING_ENUM(DragOperationPrivate); | 50 COMPILE_ASSERT_MATCHING_ENUM(DragOperationPrivate); |
| 51 COMPILE_ASSERT_MATCHING_ENUM(DragOperationMove); | 51 COMPILE_ASSERT_MATCHING_ENUM(DragOperationMove); |
| 52 COMPILE_ASSERT_MATCHING_ENUM(DragOperationDelete); | 52 COMPILE_ASSERT_MATCHING_ENUM(DragOperationDelete); |
| 53 COMPILE_ASSERT_MATCHING_ENUM(DragOperationEvery); | 53 COMPILE_ASSERT_MATCHING_ENUM(DragOperationEvery); |
| 54 | 54 |
| 55 @interface WebContentsViewCocoa (Private) | 55 @interface WebContentsViewCocoa (Private) |
| (...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 [[[notification userInfo] objectForKey:kSelectionDirection] | 567 [[[notification userInfo] objectForKey:kSelectionDirection] |
| 568 unsignedIntegerValue]; | 568 unsignedIntegerValue]; |
| 569 if (direction == NSDirectSelection) | 569 if (direction == NSDirectSelection) |
| 570 return; | 570 return; |
| 571 | 571 |
| 572 [self webContents]-> | 572 [self webContents]-> |
| 573 FocusThroughTabTraversal(direction == NSSelectingPrevious); | 573 FocusThroughTabTraversal(direction == NSSelectingPrevious); |
| 574 } | 574 } |
| 575 | 575 |
| 576 @end | 576 @end |
| OLD | NEW |