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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 - (void)startDragWithDropData:(const WebDropData&)dropData | 50 - (void)startDragWithDropData:(const WebDropData&)dropData |
51 dragOperationMask:(NSDragOperation)operationMask | 51 dragOperationMask:(NSDragOperation)operationMask |
52 image:(NSImage*)image | 52 image:(NSImage*)image |
53 offset:(NSPoint)offset; | 53 offset:(NSPoint)offset; |
54 - (void)cancelDeferredClose; | 54 - (void)cancelDeferredClose; |
55 - (void)clearWebContentsView; | 55 - (void)clearWebContentsView; |
56 - (void)closeTabAfterEvent; | 56 - (void)closeTabAfterEvent; |
57 - (void)viewDidBecomeFirstResponder:(NSNotification*)notification; | 57 - (void)viewDidBecomeFirstResponder:(NSNotification*)notification; |
58 @end | 58 @end |
59 | 59 |
60 namespace web_contents_view_mac { | 60 namespace content { |
61 content::WebContentsView* CreateWebContentsView( | 61 WebContentsView* CreateWebContentsView(WebContentsImpl* web_contents, |
62 WebContentsImpl* web_contents, | 62 WebContentsViewDelegate* delegate) { |
63 content::WebContentsViewDelegate* delegate) { | |
64 return new WebContentsViewMac(web_contents, delegate); | 63 return new WebContentsViewMac(web_contents, delegate); |
65 } | 64 } |
66 } | 65 } |
67 | 66 |
68 WebContentsViewMac::WebContentsViewMac( | 67 WebContentsViewMac::WebContentsViewMac( |
69 WebContentsImpl* web_contents, | 68 WebContentsImpl* web_contents, |
70 content::WebContentsViewDelegate* delegate) | 69 content::WebContentsViewDelegate* delegate) |
71 : web_contents_(web_contents), | 70 : web_contents_(web_contents), |
72 delegate_(delegate) { | 71 delegate_(delegate) { |
73 } | 72 } |
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 [[[notification userInfo] objectForKey:kSelectionDirection] | 578 [[[notification userInfo] objectForKey:kSelectionDirection] |
580 unsignedIntegerValue]; | 579 unsignedIntegerValue]; |
581 if (direction == NSDirectSelection) | 580 if (direction == NSDirectSelection) |
582 return; | 581 return; |
583 | 582 |
584 [self webContents]-> | 583 [self webContents]-> |
585 FocusThroughTabTraversal(direction == NSSelectingPrevious); | 584 FocusThroughTabTraversal(direction == NSSelectingPrevious); |
586 } | 585 } |
587 | 586 |
588 @end | 587 @end |
OLD | NEW |