| 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 // For some reason known only to Cocoa, the autorecalculation of the key view | 132 // For some reason known only to Cocoa, the autorecalculation of the key view |
| 133 // loop set on the window doesn't set the next key view when the subview is | 133 // loop set on the window doesn't set the next key view when the subview is |
| 134 // added. On 10.6 things magically work fine; on 10.5 they fail | 134 // added. On 10.6 things magically work fine; on 10.5 they fail |
| 135 // <http://crbug.com/61493>. Digging into Cocoa key view loop code yielded | 135 // <http://crbug.com/61493>. Digging into Cocoa key view loop code yielded |
| 136 // madness; TODO(avi,rohit): look at this again and figure out what's really | 136 // madness; TODO(avi,rohit): look at this again and figure out what's really |
| 137 // going on. | 137 // going on. |
| 138 [cocoa_view_.get() setNextKeyView:view_view]; | 138 [cocoa_view_.get() setNextKeyView:view_view]; |
| 139 return view; | 139 return view; |
| 140 } | 140 } |
| 141 | 141 |
| 142 void WebContentsViewMac::SetView(RenderWidgetHostView* view) { |
| 143 } |
| 144 |
| 142 gfx::NativeView WebContentsViewMac::GetNativeView() const { | 145 gfx::NativeView WebContentsViewMac::GetNativeView() const { |
| 143 return cocoa_view_.get(); | 146 return cocoa_view_.get(); |
| 144 } | 147 } |
| 145 | 148 |
| 146 gfx::NativeView WebContentsViewMac::GetContentNativeView() const { | 149 gfx::NativeView WebContentsViewMac::GetContentNativeView() const { |
| 147 RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView(); | 150 RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView(); |
| 148 if (!rwhv) | 151 if (!rwhv) |
| 149 return NULL; | 152 return NULL; |
| 150 return rwhv->GetNativeView(); | 153 return rwhv->GetNativeView(); |
| 151 } | 154 } |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 [[[notification userInfo] objectForKey:kSelectionDirection] | 536 [[[notification userInfo] objectForKey:kSelectionDirection] |
| 534 unsignedIntegerValue]; | 537 unsignedIntegerValue]; |
| 535 if (direction == NSDirectSelection) | 538 if (direction == NSDirectSelection) |
| 536 return; | 539 return; |
| 537 | 540 |
| 538 [self webContents]-> | 541 [self webContents]-> |
| 539 FocusThroughTabTraversal(direction == NSSelectingPrevious); | 542 FocusThroughTabTraversal(direction == NSSelectingPrevious); |
| 540 } | 543 } |
| 541 | 544 |
| 542 @end | 545 @end |
| OLD | NEW |