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 13 matching lines...) Expand all Loading... |
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 WebKit::WebDragOperation; |
32 using WebKit::WebDragOperationsMask; | 32 using WebKit::WebDragOperationsMask; |
33 using content::PopupMenuHelper; | 33 using content::PopupMenuHelper; |
| 34 using content::RenderViewHostFactory; |
34 using content::RenderWidgetHostView; | 35 using content::RenderWidgetHostView; |
35 using content::RenderWidgetHostViewMac; | 36 using content::RenderWidgetHostViewMac; |
36 using content::WebContents; | 37 using content::WebContents; |
37 using content::WebContentsImpl; | 38 using content::WebContentsImpl; |
38 | 39 |
39 // Ensure that the WebKit::WebDragOperation enum values stay in sync with | 40 // Ensure that the WebKit::WebDragOperation enum values stay in sync with |
40 // NSDragOperation constants, since the code below static_casts between 'em. | 41 // NSDragOperation constants, since the code below static_casts between 'em. |
41 #define COMPILE_ASSERT_MATCHING_ENUM(name) \ | 42 #define COMPILE_ASSERT_MATCHING_ENUM(name) \ |
42 COMPILE_ASSERT(int(NS##name) == int(WebKit::Web##name), enum_mismatch_##name) | 43 COMPILE_ASSERT(int(NS##name) == int(WebKit::Web##name), enum_mismatch_##name) |
43 COMPILE_ASSERT_MATCHING_ENUM(DragOperationNone); | 44 COMPILE_ASSERT_MATCHING_ENUM(DragOperationNone); |
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
530 [[[notification userInfo] objectForKey:kSelectionDirection] | 531 [[[notification userInfo] objectForKey:kSelectionDirection] |
531 unsignedIntegerValue]; | 532 unsignedIntegerValue]; |
532 if (direction == NSDirectSelection) | 533 if (direction == NSDirectSelection) |
533 return; | 534 return; |
534 | 535 |
535 [self webContents]-> | 536 [self webContents]-> |
536 FocusThroughTabTraversal(direction == NSSelectingPrevious); | 537 FocusThroughTabTraversal(direction == NSSelectingPrevious); |
537 } | 538 } |
538 | 539 |
539 @end | 540 @end |
OLD | NEW |