Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: chrome/browser/tab_contents/tab_contents_view_mac.mm

Issue 1596025: Move third_pary/mozilla/include up one directory. (Closed)
Patch Set: Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/shell_integration_mac.mm ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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" 11 #import "base/chrome_application_mac.h"
12 #include "chrome/browser/browser.h" // TODO(beng): this dependency is awful. 12 #include "chrome/browser/browser.h" // TODO(beng): this dependency is awful.
13 #import "chrome/browser/cocoa/focus_tracker.h" 13 #import "chrome/browser/cocoa/focus_tracker.h"
14 #import "chrome/browser/cocoa/chrome_browser_window.h" 14 #import "chrome/browser/cocoa/chrome_browser_window.h"
15 #import "chrome/browser/cocoa/browser_window_controller.h" 15 #import "chrome/browser/cocoa/browser_window_controller.h"
16 #include "chrome/browser/global_keyboard_shortcuts_mac.h" 16 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
17 #include "chrome/browser/cocoa/sad_tab_controller.h" 17 #include "chrome/browser/cocoa/sad_tab_controller.h"
18 #import "chrome/browser/cocoa/web_drag_source.h" 18 #import "chrome/browser/cocoa/web_drag_source.h"
19 #import "chrome/browser/cocoa/web_drop_target.h" 19 #import "chrome/browser/cocoa/web_drop_target.h"
20 #include "chrome/browser/renderer_host/render_view_host.h" 20 #include "chrome/browser/renderer_host/render_view_host.h"
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 #include "skia/ext/skia_utils_mac.h" 29 #include "skia/ext/skia_utils_mac.h"
30 #import "third_party/mozilla/include/NSPasteboard+Utils.h" 30 #import "third_party/mozilla/NSPasteboard+Utils.h"
31 31
32 using WebKit::WebDragOperation; 32 using WebKit::WebDragOperation;
33 using WebKit::WebDragOperationsMask; 33 using WebKit::WebDragOperationsMask;
34 34
35 // Ensure that the WebKit::WebDragOperation enum values stay in sync with 35 // Ensure that the WebKit::WebDragOperation enum values stay in sync with
36 // NSDragOperation constants, since the code below static_casts between 'em. 36 // NSDragOperation constants, since the code below static_casts between 'em.
37 #define COMPILE_ASSERT_MATCHING_ENUM(name) \ 37 #define COMPILE_ASSERT_MATCHING_ENUM(name) \
38 COMPILE_ASSERT(int(NS##name) == int(WebKit::Web##name), enum_mismatch_##name) 38 COMPILE_ASSERT(int(NS##name) == int(WebKit::Web##name), enum_mismatch_##name)
39 COMPILE_ASSERT_MATCHING_ENUM(DragOperationNone); 39 COMPILE_ASSERT_MATCHING_ENUM(DragOperationNone);
40 COMPILE_ASSERT_MATCHING_ENUM(DragOperationCopy); 40 COMPILE_ASSERT_MATCHING_ENUM(DragOperationCopy);
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 [NSObject cancelPreviousPerformRequestsWithTarget:self 452 [NSObject cancelPreviousPerformRequestsWithTarget:self
453 selector:aSel 453 selector:aSel
454 object:nil]; 454 object:nil];
455 } 455 }
456 456
457 - (void)closeTabAfterEvent { 457 - (void)closeTabAfterEvent {
458 tabContentsView_->CloseTab(); 458 tabContentsView_->CloseTab();
459 } 459 }
460 460
461 @end 461 @end
OLDNEW
« no previous file with comments | « chrome/browser/shell_integration_mac.mm ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698