| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "chrome/browser/tab_contents/tab_contents_view_mac.h" | 7 #include "chrome/browser/tab_contents/tab_contents_view_mac.h" |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/common/render_messages.h" | 21 #include "chrome/common/render_messages.h" |
| 22 #include "content/browser/renderer_host/render_view_host.h" | 22 #include "content/browser/renderer_host/render_view_host.h" |
| 23 #include "content/browser/renderer_host/render_view_host_factory.h" | 23 #include "content/browser/renderer_host/render_view_host_factory.h" |
| 24 #include "content/browser/renderer_host/render_widget_host.h" | 24 #include "content/browser/renderer_host/render_widget_host.h" |
| 25 #include "content/browser/tab_contents/tab_contents.h" | 25 #include "content/browser/tab_contents/tab_contents.h" |
| 26 #include "content/browser/tab_contents/tab_contents_delegate.h" | 26 #include "content/browser/tab_contents/tab_contents_delegate.h" |
| 27 #import "content/common/chrome_application_mac.h" | 27 #import "content/common/chrome_application_mac.h" |
| 28 #include "content/common/notification_details.h" | 28 #include "content/common/notification_details.h" |
| 29 #include "content/common/notification_source.h" | 29 #include "content/common/notification_source.h" |
| 30 #include "content/common/notification_type.h" | 30 #include "content/common/notification_type.h" |
| 31 #include "content/common/view_messages.h" |
| 31 #include "skia/ext/skia_utils_mac.h" | 32 #include "skia/ext/skia_utils_mac.h" |
| 32 #import "third_party/mozilla/NSPasteboard+Utils.h" | 33 #import "third_party/mozilla/NSPasteboard+Utils.h" |
| 33 | 34 |
| 34 using WebKit::WebDragOperation; | 35 using WebKit::WebDragOperation; |
| 35 using WebKit::WebDragOperationsMask; | 36 using WebKit::WebDragOperationsMask; |
| 36 | 37 |
| 37 // Ensure that the WebKit::WebDragOperation enum values stay in sync with | 38 // Ensure that the WebKit::WebDragOperation enum values stay in sync with |
| 38 // NSDragOperation constants, since the code below static_casts between 'em. | 39 // NSDragOperation constants, since the code below static_casts between 'em. |
| 39 #define COMPILE_ASSERT_MATCHING_ENUM(name) \ | 40 #define COMPILE_ASSERT_MATCHING_ENUM(name) \ |
| 40 COMPILE_ASSERT(int(NS##name) == int(WebKit::Web##name), enum_mismatch_##name) | 41 COMPILE_ASSERT(int(NS##name) == int(WebKit::Web##name), enum_mismatch_##name) |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 511 [[[notification userInfo] objectForKey:kSelectionDirection] | 512 [[[notification userInfo] objectForKey:kSelectionDirection] |
| 512 unsignedIntegerValue]; | 513 unsignedIntegerValue]; |
| 513 if (direction == NSDirectSelection) | 514 if (direction == NSDirectSelection) |
| 514 return; | 515 return; |
| 515 | 516 |
| 516 [self tabContents]-> | 517 [self tabContents]-> |
| 517 FocusThroughTabTraversal(direction == NSSelectingPrevious); | 518 FocusThroughTabTraversal(direction == NSSelectingPrevious); |
| 518 } | 519 } |
| 519 | 520 |
| 520 @end | 521 @end |
| OLD | NEW |