| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 - (void)setCurrentDragOperation:(NSDragOperation)operation; | 54 - (void)setCurrentDragOperation:(NSDragOperation)operation; |
| 55 - (void)startDragWithDropData:(const WebDropData&)dropData | 55 - (void)startDragWithDropData:(const WebDropData&)dropData |
| 56 dragOperationMask:(NSDragOperation)operationMask | 56 dragOperationMask:(NSDragOperation)operationMask |
| 57 image:(NSImage*)image | 57 image:(NSImage*)image |
| 58 offset:(NSPoint)offset; | 58 offset:(NSPoint)offset; |
| 59 - (void)cancelDeferredClose; | 59 - (void)cancelDeferredClose; |
| 60 - (void)closeTabAfterEvent; | 60 - (void)closeTabAfterEvent; |
| 61 - (void)viewDidBecomeFirstResponder:(NSNotification*)notification; | 61 - (void)viewDidBecomeFirstResponder:(NSNotification*)notification; |
| 62 @end | 62 @end |
| 63 | 63 |
| 64 // static | 64 namespace tab_contents_view_mac { |
| 65 TabContentsView* TabContentsView::Create(TabContents* tab_contents) { | 65 TabContentsView* CreateTabContentsView(TabContents* tab_contents) { |
| 66 return new TabContentsViewMac(tab_contents); | 66 return new TabContentsViewMac(tab_contents); |
| 67 } | 67 } |
| 68 } |
| 68 | 69 |
| 69 TabContentsViewMac::TabContentsViewMac(TabContents* tab_contents) | 70 TabContentsViewMac::TabContentsViewMac(TabContents* tab_contents) |
| 70 : tab_contents_(tab_contents), | 71 : tab_contents_(tab_contents), |
| 71 preferred_width_(0) { | 72 preferred_width_(0) { |
| 72 registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_CONNECTED, | 73 registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_CONNECTED, |
| 73 Source<TabContents>(tab_contents)); | 74 Source<TabContents>(tab_contents)); |
| 74 } | 75 } |
| 75 | 76 |
| 76 TabContentsViewMac::~TabContentsViewMac() { | 77 TabContentsViewMac::~TabContentsViewMac() { |
| 77 // This handles the case where a renderer close call was deferred | 78 // This handles the case where a renderer close call was deferred |
| (...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 [[[notification userInfo] objectForKey:kSelectionDirection] | 577 [[[notification userInfo] objectForKey:kSelectionDirection] |
| 577 unsignedIntegerValue]; | 578 unsignedIntegerValue]; |
| 578 if (direction == NSDirectSelection) | 579 if (direction == NSDirectSelection) |
| 579 return; | 580 return; |
| 580 | 581 |
| 581 [self tabContents]-> | 582 [self tabContents]-> |
| 582 FocusThroughTabTraversal(direction == NSSelectingPrevious); | 583 FocusThroughTabTraversal(direction == NSSelectingPrevious); |
| 583 } | 584 } |
| 584 | 585 |
| 585 @end | 586 @end |
| OLD | NEW |