| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 |
| 11 #import "base/chrome_application_mac.h" | |
| 12 #include "chrome/browser/global_keyboard_shortcuts_mac.h" | 11 #include "chrome/browser/global_keyboard_shortcuts_mac.h" |
| 13 #include "chrome/browser/renderer_host/render_view_host.h" | 12 #include "chrome/browser/renderer_host/render_view_host.h" |
| 14 #include "chrome/browser/renderer_host/render_view_host_factory.h" | 13 #include "chrome/browser/renderer_host/render_view_host_factory.h" |
| 15 #include "chrome/browser/renderer_host/render_widget_host.h" | 14 #include "chrome/browser/renderer_host/render_widget_host.h" |
| 16 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" | 15 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" |
| 17 #include "chrome/browser/tab_contents/popup_menu_helper_mac.h" | 16 #include "chrome/browser/tab_contents/popup_menu_helper_mac.h" |
| 18 #include "chrome/browser/tab_contents/render_view_context_menu_mac.h" | 17 #include "chrome/browser/tab_contents/render_view_context_menu_mac.h" |
| 19 #include "chrome/browser/tab_contents/tab_contents.h" | 18 #include "chrome/browser/tab_contents/tab_contents.h" |
| 20 #include "chrome/browser/tab_contents/tab_contents_delegate.h" | 19 #include "chrome/browser/tab_contents/tab_contents_delegate.h" |
| 21 #import "chrome/browser/ui/cocoa/focus_tracker.h" | 20 #import "chrome/browser/ui/cocoa/focus_tracker.h" |
| 22 #import "chrome/browser/ui/cocoa/browser_window_controller.h" | 21 #import "chrome/browser/ui/cocoa/browser_window_controller.h" |
| 23 #include "chrome/browser/ui/cocoa/sad_tab_controller.h" | 22 #include "chrome/browser/ui/cocoa/sad_tab_controller.h" |
| 24 #import "chrome/browser/ui/cocoa/web_drag_source.h" | 23 #import "chrome/browser/ui/cocoa/web_drag_source.h" |
| 25 #import "chrome/browser/ui/cocoa/web_drop_target.h" | 24 #import "chrome/browser/ui/cocoa/web_drop_target.h" |
| 26 #import "chrome/browser/ui/cocoa/view_id_util.h" | 25 #import "chrome/browser/ui/cocoa/view_id_util.h" |
| 26 #import "chrome/common/chrome_application_mac.h" |
| 27 #include "chrome/common/notification_type.h" | 27 #include "chrome/common/notification_type.h" |
| 28 #include "chrome/common/notification_service.h" | 28 #include "chrome/common/notification_service.h" |
| 29 #include "chrome/common/render_messages.h" | 29 #include "chrome/common/render_messages.h" |
| 30 #include "skia/ext/skia_utils_mac.h" | 30 #include "skia/ext/skia_utils_mac.h" |
| 31 #import "third_party/mozilla/NSPasteboard+Utils.h" | 31 #import "third_party/mozilla/NSPasteboard+Utils.h" |
| 32 | 32 |
| 33 using WebKit::WebDragOperation; | 33 using WebKit::WebDragOperation; |
| 34 using WebKit::WebDragOperationsMask; | 34 using WebKit::WebDragOperationsMask; |
| 35 | 35 |
| 36 // Ensure that the WebKit::WebDragOperation enum values stay in sync with | 36 // Ensure that the WebKit::WebDragOperation enum values stay in sync with |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 [[[notification userInfo] objectForKey:kSelectionDirection] | 504 [[[notification userInfo] objectForKey:kSelectionDirection] |
| 505 unsignedIntegerValue]; | 505 unsignedIntegerValue]; |
| 506 if (direction == NSDirectSelection) | 506 if (direction == NSDirectSelection) |
| 507 return; | 507 return; |
| 508 | 508 |
| 509 [self tabContents]-> | 509 [self tabContents]-> |
| 510 FocusThroughTabTraversal(direction == NSSelectingPrevious); | 510 FocusThroughTabTraversal(direction == NSSelectingPrevious); |
| 511 } | 511 } |
| 512 | 512 |
| 513 @end | 513 @end |
| OLD | NEW |