| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/browser/renderer_host/render_view_host_factory.h" | 21 #include "chrome/browser/renderer_host/render_view_host_factory.h" |
| 22 #include "chrome/browser/renderer_host/render_widget_host.h" | 22 #include "chrome/browser/renderer_host/render_widget_host.h" |
| 23 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" | 23 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" |
| 24 #include "chrome/browser/tab_contents/render_view_context_menu_mac.h" | 24 #include "chrome/browser/tab_contents/render_view_context_menu_mac.h" |
| 25 #include "chrome/browser/tab_contents/tab_contents.h" | 25 #include "chrome/browser/tab_contents/tab_contents.h" |
| 26 #include "chrome/common/notification_type.h" | 26 #include "chrome/common/notification_type.h" |
| 27 #include "chrome/common/notification_service.h" | 27 #include "chrome/common/notification_service.h" |
| 28 #include "chrome/common/render_messages.h" | 28 #include "chrome/common/render_messages.h" |
| 29 #import "third_party/mozilla/include/NSPasteboard+Utils.h" | 29 #import "third_party/mozilla/include/NSPasteboard+Utils.h" |
| 30 | 30 |
| 31 #include "chrome/common/temp_scaffolding_stubs.h" | |
| 32 | |
| 33 using WebKit::WebDragOperation; | 31 using WebKit::WebDragOperation; |
| 34 using WebKit::WebDragOperationsMask; | 32 using WebKit::WebDragOperationsMask; |
| 35 | 33 |
| 36 // Ensure that the WebKit::WebDragOperation enum values stay in sync with | 34 // Ensure that the WebKit::WebDragOperation enum values stay in sync with |
| 37 // NSDragOperation constants, since the code below static_casts between 'em. | 35 // NSDragOperation constants, since the code below static_casts between 'em. |
| 38 #define COMPILE_ASSERT_MATCHING_ENUM(name) \ | 36 #define COMPILE_ASSERT_MATCHING_ENUM(name) \ |
| 39 COMPILE_ASSERT(int(NS##name) == int(WebKit::Web##name), enum_mismatch_##name) | 37 COMPILE_ASSERT(int(NS##name) == int(WebKit::Web##name), enum_mismatch_##name) |
| 40 COMPILE_ASSERT_MATCHING_ENUM(DragOperationNone); | 38 COMPILE_ASSERT_MATCHING_ENUM(DragOperationNone); |
| 41 COMPILE_ASSERT_MATCHING_ENUM(DragOperationCopy); | 39 COMPILE_ASSERT_MATCHING_ENUM(DragOperationCopy); |
| 42 COMPILE_ASSERT_MATCHING_ENUM(DragOperationLink); | 40 COMPILE_ASSERT_MATCHING_ENUM(DragOperationLink); |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 477 } | 475 } |
| 478 | 476 |
| 479 - (void)closeTabAfterEvent { | 477 - (void)closeTabAfterEvent { |
| 480 tabContentsView_->CloseTab(); | 478 tabContentsView_->CloseTab(); |
| 481 } | 479 } |
| 482 | 480 |
| 483 // Tons of stuff goes here, where we grab events going on in Cocoaland and send | 481 // Tons of stuff goes here, where we grab events going on in Cocoaland and send |
| 484 // them into the C++ system. TODO(avi): all that jazz | 482 // them into the C++ system. TODO(avi): all that jazz |
| 485 | 483 |
| 486 @end | 484 @end |
| OLD | NEW |